Skip to contentSkip to conversation

mfd: hi6421-spmi-pmic: cleanup drvdata

PATCH Applied Mauro Carvalho Chehab 3 participants 7 messages Sep 2, 2021 – Oct 5, 2021

Subsystems (4)
Char and misc drivers Multifunction devices (MFD) Voltage and current regulator framework HiSilicon SPMI PMIC driver for hikey 6421v600
lore
Share & tools
lore

Mauro Carvalho Chehab

author maintainer
#0 lore raw

PATCH v2 1/1 mfd: hi6421-spmi-pmic: cleanup drvdata

There are lots of fields at struct hi6421_spmi_pmic that aren't used. In a matter of fact, only regmap is needed.

So, drop the struct as a hole, and set just the regmap as the drvdata.

Acked-by Mark Brown <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/mfd/hi6421-spmi-pmic.c           | 16 +++++----------
 drivers/misc/hi6421v600-irq.c            |  9 ++++-----
 drivers/regulator/hi6421v600-regulator.c | 10 +++++-----
 include/linux/mfd/hi6421-spmi-pmic.h     | 25 ------------------------
 4 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 include/linux/mfd/hi6421-spmi-pmic.h
drivers/mfd/hi6421-spmi-pmic.c +5 -11
index 4f136826681b..c9c0c3d7011f 100644
@@ -8,7 +8,6 @@
  */
 
 #include <linux/mfd/core.h>
-#include <linux/mfd/hi6421-spmi-pmic.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>

@@ -30,19 +29,14 @@ static const struct regmap_config regmap_config = {
 static int hi6421_spmi_pmic_probe(struct spmi_device *sdev)
 {
 	struct device *dev = &sdev->dev;
+	struct regmap *regmap;
 	int ret;
-	struct hi6421_spmi_pmic *ddata;
-	ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
-	if (!ddata)
-		return -ENOMEM;
 
-	ddata->regmap = devm_regmap_init_spmi_ext(sdev, &regmap_config);
-	if (IS_ERR(ddata->regmap))
-		return PTR_ERR(ddata->regmap);
+	regmap = devm_regmap_init_spmi_ext(sdev, &regmap_config);
+	if (IS_ERR(regmap))
+		return PTR_ERR(regmap);
 
-	ddata->dev = dev;
-
-	dev_set_drvdata(&sdev->dev, ddata);
+	dev_set_drvdata(&sdev->dev, regmap);
 
 	ret = devm_mfd_add_devices(&sdev->dev, PLATFORM_DEVID_NONE,
 				   hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs),
drivers/misc/hi6421v600-irq.c +4 -5
index 08535e97ff43..1c763796cf1f 100644
@@ -10,7 +10,6 @@
 #include <linux/bitops.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mfd/hi6421-spmi-pmic.h>
 #include <linux/module.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>

@@ -220,7 +219,7 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)
 	struct platform_device *pmic_pdev;
 	struct device *dev = &pdev->dev;
 	struct hi6421v600_irq *priv;
-	struct hi6421_spmi_pmic *pmic;
+	struct regmap *regmap;
 	unsigned int virq;
 	int i, ret;
 

@@ -229,8 +228,8 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)
 	 * which should first set drvdata. If this doesn't happen, hit
 	 * a warn on and return.
 	 */
-	pmic = dev_get_drvdata(pmic_dev);
-	if (WARN_ON(!pmic))
+	regmap = dev_get_drvdata(pmic_dev);
+	if (WARN_ON(!regmap))
 		return -ENODEV;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

@@ -238,7 +237,7 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	priv->dev = dev;
-	priv->regmap = pmic->regmap;
+	priv->regmap = regmap;
 
 	spin_lock_init(&priv->lock);
drivers/regulator/hi6421v600-regulator.c +5 -5
index 662d87ae61cb..4671678f6b19 100644
@@ -9,8 +9,8 @@
 // Guodong Xu <[email protected]>
 
 #include <linux/delay.h>
-#include <linux/mfd/hi6421-spmi-pmic.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/regulator/driver.h>

@@ -237,7 +237,7 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
 	struct hi6421_spmi_reg_priv *priv;
 	struct hi6421_spmi_reg_info *info;
 	struct device *dev = &pdev->dev;
-	struct hi6421_spmi_pmic *pmic;
+	struct regmap *regmap;
 	struct regulator_dev *rdev;
 	int i;
 

@@ -246,8 +246,8 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
 	 * which should first set drvdata. If this doesn't happen, hit
 	 * a warn on and return.
 	 */
-	pmic = dev_get_drvdata(pmic_dev);
-	if (WARN_ON(!pmic))
+	regmap = dev_get_drvdata(pmic_dev);
+	if (WARN_ON(!regmap))
 		return -ENODEV;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

@@ -261,7 +261,7 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
 
 		config.dev = pdev->dev.parent;
 		config.driver_data = priv;
-		config.regmap = pmic->regmap;
+		config.regmap = regmap;
 
 		rdev = devm_regulator_register(dev, &info->desc, &config);
 		if (IS_ERR(rdev)) {
include/linux/mfd/hi6421-spmi-pmic.h deleted +0 -25
deleted file mode 100644
index e5b8dbf828b6..000000000000
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Header file for device driver Hi6421 PMIC
- *
- * Copyright (c) 2013 Linaro Ltd.
- * Copyright (C) 2011 Hisilicon.
- * Copyright (c) 2020-2021 Huawei Technologies Co., Ltd
- *
- * Guodong Xu <[email protected]>
- */
-
-#ifndef	__HISI_PMIC_H
-#define	__HISI_PMIC_H
-
-#include <linux/irqdomain.h>
-#include <linux/regmap.h>
-
-struct hi6421_spmi_pmic {
-	struct resource				*res;
-	struct device				*dev;
-	void __iomem				*regs;
-	struct regmap				*regmap;
-};
-
-#endif		/* __HISI_PMIC_H */
Signature · 1 line
2.31.1
#1 lore raw
Quoted 1 line · Mauro Carvalho Chehab

There are lots of fields at struct hi6421_spmi_pmic that aren't

s/at/in/

Quoted 1 line

used. In a matter of fact, only regmap is needed.

s/In/As/

Quoted 1 line

So, drop the struct as a hole, and set just the regmap as

s/hole/whole/

s/set just/just set/

Quoted 6 lines

the drvdata.

Acked-by Mark Brown <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/mfd/hi6421-spmi-pmic.c           | 16 +++++----------

For my own reference (apply this as-is to your sign-off block):

Acked-for-MFD-by Lee Jones <[email protected]>
Quoted 5 lines
 drivers/misc/hi6421v600-irq.c            |  9 ++++-----
 drivers/regulator/hi6421v600-regulator.c | 10 +++++-----
 include/linux/mfd/hi6421-spmi-pmic.h     | 25 ------------------------
 4 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 include/linux/mfd/hi6421-spmi-pmic.h

Looks as though we're still missing a misc Ack.

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
author maintainer
#2 lore raw

PATCH v2 1/1 mfd: hi6421-spmi-pmic: cleanup drvdata

There are lots of fields in struct hi6421_spmi_pmic that aren't used. As a matter of fact, only regmap is needed.

So, drop the struct as a whole, and just set the regmap as the drvdata.

Acked-by Mark Brown <[email protected]>
Acked-for-MFD-by Lee Jones <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
 drivers/mfd/hi6421-spmi-pmic.c           | 16 +++++----------
 drivers/misc/hi6421v600-irq.c            |  9 ++++-----
 drivers/regulator/hi6421v600-regulator.c | 10 +++++-----
 include/linux/mfd/hi6421-spmi-pmic.h     | 25 ------------------------
 4 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 include/linux/mfd/hi6421-spmi-pmic.h
drivers/mfd/hi6421-spmi-pmic.c +5 -11
index 4f136826681b..c9c0c3d7011f 100644
@@ -8,7 +8,6 @@
  */
 
 #include <linux/mfd/core.h>
-#include <linux/mfd/hi6421-spmi-pmic.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>

@@ -30,19 +29,14 @@ static const struct regmap_config regmap_config = {
 static int hi6421_spmi_pmic_probe(struct spmi_device *sdev)
 {
 	struct device *dev = &sdev->dev;
+	struct regmap *regmap;
 	int ret;
-	struct hi6421_spmi_pmic *ddata;
-	ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
-	if (!ddata)
-		return -ENOMEM;
 
-	ddata->regmap = devm_regmap_init_spmi_ext(sdev, &regmap_config);
-	if (IS_ERR(ddata->regmap))
-		return PTR_ERR(ddata->regmap);
+	regmap = devm_regmap_init_spmi_ext(sdev, &regmap_config);
+	if (IS_ERR(regmap))
+		return PTR_ERR(regmap);
 
-	ddata->dev = dev;
-
-	dev_set_drvdata(&sdev->dev, ddata);
+	dev_set_drvdata(&sdev->dev, regmap);
 
 	ret = devm_mfd_add_devices(&sdev->dev, PLATFORM_DEVID_NONE,
 				   hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs),
drivers/misc/hi6421v600-irq.c +4 -5
index 08535e97ff43..1c763796cf1f 100644
@@ -10,7 +10,6 @@
 #include <linux/bitops.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mfd/hi6421-spmi-pmic.h>
 #include <linux/module.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>

@@ -220,7 +219,7 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)
 	struct platform_device *pmic_pdev;
 	struct device *dev = &pdev->dev;
 	struct hi6421v600_irq *priv;
-	struct hi6421_spmi_pmic *pmic;
+	struct regmap *regmap;
 	unsigned int virq;
 	int i, ret;
 

@@ -229,8 +228,8 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)
 	 * which should first set drvdata. If this doesn't happen, hit
 	 * a warn on and return.
 	 */
-	pmic = dev_get_drvdata(pmic_dev);
-	if (WARN_ON(!pmic))
+	regmap = dev_get_drvdata(pmic_dev);
+	if (WARN_ON(!regmap))
 		return -ENODEV;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

@@ -238,7 +237,7 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	priv->dev = dev;
-	priv->regmap = pmic->regmap;
+	priv->regmap = regmap;
 
 	spin_lock_init(&priv->lock);
drivers/regulator/hi6421v600-regulator.c +5 -5
index 662d87ae61cb..4671678f6b19 100644
@@ -9,8 +9,8 @@
 // Guodong Xu <[email protected]>
 
 #include <linux/delay.h>
-#include <linux/mfd/hi6421-spmi-pmic.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/regulator/driver.h>

@@ -237,7 +237,7 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
 	struct hi6421_spmi_reg_priv *priv;
 	struct hi6421_spmi_reg_info *info;
 	struct device *dev = &pdev->dev;
-	struct hi6421_spmi_pmic *pmic;
+	struct regmap *regmap;
 	struct regulator_dev *rdev;
 	int i;
 

@@ -246,8 +246,8 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
 	 * which should first set drvdata. If this doesn't happen, hit
 	 * a warn on and return.
 	 */
-	pmic = dev_get_drvdata(pmic_dev);
-	if (WARN_ON(!pmic))
+	regmap = dev_get_drvdata(pmic_dev);
+	if (WARN_ON(!regmap))
 		return -ENODEV;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

@@ -261,7 +261,7 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
 
 		config.dev = pdev->dev.parent;
 		config.driver_data = priv;
-		config.regmap = pmic->regmap;
+		config.regmap = regmap;
 
 		rdev = devm_regulator_register(dev, &info->desc, &config);
 		if (IS_ERR(rdev)) {
include/linux/mfd/hi6421-spmi-pmic.h deleted +0 -25
deleted file mode 100644
index e5b8dbf828b6..000000000000
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Header file for device driver Hi6421 PMIC
- *
- * Copyright (c) 2013 Linaro Ltd.
- * Copyright (C) 2011 Hisilicon.
- * Copyright (c) 2020-2021 Huawei Technologies Co., Ltd
- *
- * Guodong Xu <[email protected]>
- */
-
-#ifndef	__HISI_PMIC_H
-#define	__HISI_PMIC_H
-
-#include <linux/irqdomain.h>
-#include <linux/regmap.h>
-
-struct hi6421_spmi_pmic {
-	struct resource				*res;
-	struct device				*dev;
-	void __iomem				*regs;
-	struct regmap				*regmap;
-};
-
-#endif		/* __HISI_PMIC_H */
Signature · 1 line
2.31.1
maintainer Acked-by on v2 1/1
#3 lore raw
Quoted 9 lines · Mauro Carvalho Chehab

There are lots of fields in struct hi6421_spmi_pmic that aren't used. As a matter of fact, only regmap is needed.

So, drop the struct as a whole, and just set the regmap as the drvdata.

Acked-by Mark Brown <[email protected]>
Acked-for-MFD-by Lee Jones <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>

As everyone else acked this, any objection for me to just take this in my char-misc tree?

Otherwise, whoever else want to take it:

Acked-by Greg Kroah-Hartman <[email protected]>

thanks,

greg k-h

#4 lore raw
Quoted 11 lines · Greg Kroah-Hartman
Quoted 9 lines · Mauro Carvalho Chehab

There are lots of fields in struct hi6421_spmi_pmic that aren't used. As a matter of fact, only regmap is needed.

So, drop the struct as a whole, and just set the regmap as the drvdata.

Acked-by Mark Brown <[email protected]>
Acked-for-MFD-by Lee Jones <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Quoted 6 lines

As everyone else acked this, any objection for me to just take this in my char-misc tree?

Otherwise, whoever else want to take it:

Acked-by Greg Kroah-Hartman <[email protected]>

If you do end up taking it, you'll have to convert my Ack.

Although, I'm probably in a better position to take it TBH.

Happy with either. You decide.

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
maintainer
#5 lore raw
Quoted 18 lines · Lee Jones
Quoted 16 lines · Greg Kroah-Hartman
Quoted 9 lines · Mauro Carvalho Chehab

There are lots of fields in struct hi6421_spmi_pmic that aren't used. As a matter of fact, only regmap is needed.

So, drop the struct as a whole, and just set the regmap as the drvdata.

Acked-by Mark Brown <[email protected]>
Acked-for-MFD-by Lee Jones <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>

As everyone else acked this, any objection for me to just take this in my char-misc tree?

Otherwise, whoever else want to take it:

Quoted 7 lines
Quoted 1 line
Acked-by Greg Kroah-Hartman <[email protected]>

If you do end up taking it, you'll have to convert my Ack.

Although, I'm probably in a better position to take it TBH.

Happy with either. You decide.

You can take it, thanks!

greg k-h

Applied
#6 lore raw
In reply to Mauro Carvalho Chehab
Quoted 8 lines · Mauro Carvalho Chehab

There are lots of fields at struct hi6421_spmi_pmic that aren't used. In a matter of fact, only regmap is needed.

So, drop the struct as a hole, and set just the regmap as the drvdata.

Acked-by Mark Brown <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Quoted 7 lines
---
 drivers/mfd/hi6421-spmi-pmic.c           | 16 +++++----------
 drivers/misc/hi6421v600-irq.c            |  9 ++++-----
 drivers/regulator/hi6421v600-regulator.c | 10 +++++-----
 include/linux/mfd/hi6421-spmi-pmic.h     | 25 ------------------------
 4 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 include/linux/mfd/hi6421-spmi-pmic.h

Applied, thanks.

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog