[PATCH v2 01/23] mfd: bcm2835-pm: Remove member of struct bcm2835_pm that is only used locally
From: Uwe Kleine-König (The Capable Hub) <hidden>
Date: 2026-07-08 11:16:48
Also in:
lkml
Subsystem:
multifunction devices (mfd), the rest · Maintainers:
Lee Jones, Linus Torvalds
struct bcm2835_pm::soc is only used in bcm2835_pm_probe() and thus can be replaced by a local variable. With that change enum bcm2835_soc is only used in the mfd core driver and so the definition can move there. Signed-off-by: Uwe Kleine-König (The Capable Hub) <redacted> --- drivers/mfd/bcm2835-pm.c | 11 +++++++++-- include/linux/mfd/bcm2835-pm.h | 7 ------- 2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
index 9e8e3dcf4bce..87de35075419 100644
--- a/drivers/mfd/bcm2835-pm.c
+++ b/drivers/mfd/bcm2835-pm.c@@ -69,10 +69,17 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, return 0; } +enum bcm2835_soc { + BCM2835_PM_SOC_BCM2835, + BCM2835_PM_SOC_BCM2711, + BCM2835_PM_SOC_BCM2712, +}; + static int bcm2835_pm_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct bcm2835_pm *pm; + enum bcm2835_soc soc; int ret; pm = devm_kzalloc(dev, sizeof(*pm), GFP_KERNEL);
@@ -81,7 +88,7 @@ static int bcm2835_pm_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pm); pm->dev = dev; - pm->soc = (uintptr_t)device_get_match_data(dev); + soc = (uintptr_t)device_get_match_data(dev); ret = bcm2835_pm_get_pdata(pdev, pm); if (ret)
@@ -98,7 +105,7 @@ static int bcm2835_pm_probe(struct platform_device *pdev) * bcm2835-pm binding as the key for whether we can reference * the full PM register range and support power domains. */ - if (pm->asb || pm->soc == BCM2835_PM_SOC_BCM2712) + if (pm->asb || soc == BCM2835_PM_SOC_BCM2712) return devm_mfd_add_devices(dev, -1, bcm2835_power_devs, ARRAY_SIZE(bcm2835_power_devs), NULL, 0, NULL);
diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
index d2e17ab1dbfc..f70a810c55f7 100644
--- a/include/linux/mfd/bcm2835-pm.h
+++ b/include/linux/mfd/bcm2835-pm.h@@ -5,18 +5,11 @@ #include <linux/regmap.h> -enum bcm2835_soc { - BCM2835_PM_SOC_BCM2835, - BCM2835_PM_SOC_BCM2711, - BCM2835_PM_SOC_BCM2712, -}; - struct bcm2835_pm { struct device *dev; void __iomem *base; void __iomem *asb; void __iomem *rpivid_asb; - enum bcm2835_soc soc; }; #endif /* BCM2835_MFD_PM_H */
--
2.55.0.11.g153666a7d9bb