mfd: hi6421-spmi-pmic: Cleanup drvdata to only include regmap

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 set regmap as the drvdata.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/1828cb783b1ebca0b98bf0b3077d8701adb228f7.1630586862.git.mchehab+huawei@kernel.org

diff --git a/drivers/mfd/hi6421-spmi-pmic.c b/drivers/mfd/hi6421-spmi-pmic.c
index 4f13682..c9c0c3d 100644 (file)
--- a/drivers/mfd/hi6421-spmi-pmic.c
+++ b/drivers/mfd/hi6421-spmi-pmic.c
@@ -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),

diff --git a/drivers/misc/hi6421v600-irq.c b/drivers/misc/hi6421v600-irq.c
index 08535e9..1c76379 100644 (file)
--- a/drivers/misc/hi6421v600-irq.c
+++ b/drivers/misc/hi6421v600-irq.c
@@ -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);
 

diff --git a/drivers/regulator/hi6421v600-regulator.c b/drivers/regulator/hi6421v600-regulator.c
index 662d87a..4671678 100644 (file)
--- a/drivers/regulator/hi6421v600-regulator.c
+++ b/drivers/regulator/hi6421v600-regulator.c
@@ -9,8 +9,8 @@
 // Guodong Xu <guodong.xu@linaro.org>
 
 #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)) {

diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h
deleted file mode 100644 (file)
index e5b8dbf..0000000
--- a/include/linux/mfd/hi6421-spmi-pmic.h
+++ /dev/null
@@ -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 <guodong.xu@linaro.org>
- */
-
-#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 */