From b82d45a9a6de363dd80704c9a6d9f5313e6099ab Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 17 Jul 2021 11:58:12 +0200 Subject: [PATCH] staging: hi6421-spmi-pmic: rename spmi_device struct Let's not call a pointer to spmi_device as pdev, as it is something else. Signed-off-by: Mauro Carvalho Chehab Link: https://lore.kernel.org/r/758e98d7f59d739b68b33723a02aca8b9464f8da.1626515862.git.mchehab+huawei@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 35ef3d4c760b..dd7ff63214d3 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -213,9 +213,9 @@ static const struct regmap_config regmap_config = { .fast_io = true }; -static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) +static int hi6421_spmi_pmic_probe(struct spmi_device *sdev) { - struct device *dev = &pdev->dev; + struct device *dev = &sdev->dev; struct device_node *np = dev->of_node; struct hi6421_spmi_pmic *ddata; unsigned int virq; @@ -225,7 +225,7 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) if (!ddata) return -ENOMEM; - ddata->regmap = devm_regmap_init_spmi_ext(pdev, ®map_config); + ddata->regmap = devm_regmap_init_spmi_ext(sdev, ®map_config); if (IS_ERR(ddata->regmap)) return PTR_ERR(ddata->regmap); @@ -281,9 +281,9 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) return ret; } - dev_set_drvdata(&pdev->dev, ddata); + dev_set_drvdata(&sdev->dev, ddata); - ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, + ret = devm_mfd_add_devices(&sdev->dev, PLATFORM_DEVID_NONE, hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), NULL, 0, NULL); if (ret < 0) -- 2.11.0