Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 23:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Mauro Carvalho Chehab 2021-09-02 14:47:48 +02:00 committed by Lee Jones
parent 6880fa6c56
commit e68ce0faf2
4 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mfd/hi6421-spmi-pmic.c
View File

@ -8,7 +8,6 @@
*/ */
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/mfd/hi6421-spmi-pmic.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regmap.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) static int hi6421_spmi_pmic_probe(struct spmi_device *sdev)
{ {
struct device *dev = &sdev->dev; struct device *dev = &sdev->dev;
struct regmap *regmap;
int ret; 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); regmap = devm_regmap_init_spmi_ext(sdev, &regmap_config);
if (IS_ERR(ddata->regmap)) if (IS_ERR(regmap))
return PTR_ERR(ddata->regmap); return PTR_ERR(regmap);
ddata->dev = dev; dev_set_drvdata(&sdev->dev, regmap);
dev_set_drvdata(&sdev->dev, ddata);
ret = devm_mfd_add_devices(&sdev->dev, PLATFORM_DEVID_NONE, ret = devm_mfd_add_devices(&sdev->dev, PLATFORM_DEVID_NONE,
hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs),

9
drivers/misc/hi6421v600-irq.c
View File

@ -10,7 +10,6 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/mfd/hi6421-spmi-pmic.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/platform_device.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 platform_device *pmic_pdev;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct hi6421v600_irq *priv; struct hi6421v600_irq *priv;
struct hi6421_spmi_pmic *pmic; struct regmap *regmap;
unsigned int virq; unsigned int virq;
int i, ret; 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 * which should first set drvdata. If this doesn't happen, hit
* a warn on and return. * a warn on and return.
*/ */
pmic = dev_get_drvdata(pmic_dev); regmap = dev_get_drvdata(pmic_dev);
if (WARN_ON(!pmic)) if (WARN_ON(!regmap))
return -ENODEV; return -ENODEV;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@ -238,7 +237,7 @@ static int hi6421v600_irq_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
priv->dev = dev; priv->dev = dev;
priv->regmap = pmic->regmap; priv->regmap = regmap;
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);

10
drivers/regulator/hi6421v600-regulator.c
View File

@ -9,8 +9,8 @@
// Guodong Xu <guodong.xu@linaro.org> // Guodong Xu <guodong.xu@linaro.org>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mfd/hi6421-spmi-pmic.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/regulator/driver.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_priv *priv;
struct hi6421_spmi_reg_info *info; struct hi6421_spmi_reg_info *info;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct hi6421_spmi_pmic *pmic; struct regmap *regmap;
struct regulator_dev *rdev; struct regulator_dev *rdev;
int i; 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 * which should first set drvdata. If this doesn't happen, hit
* a warn on and return. * a warn on and return.
*/ */
pmic = dev_get_drvdata(pmic_dev); regmap = dev_get_drvdata(pmic_dev);
if (WARN_ON(!pmic)) if (WARN_ON(!regmap))
return -ENODEV; return -ENODEV;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); 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.dev = pdev->dev.parent;
config.driver_data = priv; config.driver_data = priv;
config.regmap = pmic->regmap; config.regmap = regmap;
rdev = devm_regulator_register(dev, &info->desc, &config); rdev = devm_regulator_register(dev, &info->desc, &config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {

25
include/linux/mfd/hi6421-spmi-pmic.h
View File

@ -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 */