pinctrl: starfive: jh7110: use struct_size

Instead of an extra kcalloc, Use a flexible array member to combine
allocations. Saves a pointer in the struct.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Hal Feng <hal.feng@starfivetech.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>

diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index e44480e71ea8fd13e3d2f6f78086475608f64a2e..3572e8edd9f30410ca95e05e5600de025fa03a94 100644 (file)
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@ -857,17 +857,15 @@ int jh7110_pinctrl_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
+#if IS_ENABLED(CONFIG_PM_SLEEP)
+       sfp = devm_kzalloc(dev, struct_size(sfp, saved_regs, info->nsaved_regs),
+                       GFP_KERNEL);
+#else
        sfp = devm_kzalloc(dev, sizeof(*sfp), GFP_KERNEL);
+#endif
        if (!sfp)
                return -ENOMEM;
 
-#if IS_ENABLED(CONFIG_PM_SLEEP)
-       sfp->saved_regs = devm_kcalloc(dev, info->nsaved_regs,
-                                      sizeof(*sfp->saved_regs), GFP_KERNEL);
-       if (!sfp->saved_regs)
-               return -ENOMEM;
-#endif
-
        sfp->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(sfp->base))
                return PTR_ERR(sfp->base);

diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h
index 2da2d6858008ccc2e7b2dd9435062f1a7745b079..188fc9d96269d3df81eec8e51b5e2127ed489c80 100644 (file)
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h
@@ -21,7 +21,7 @@ struct jh7110_pinctrl {
        /* register read/write mutex */
        struct mutex mutex;
        const struct jh7110_pinctrl_soc_info *info;
-       u32 *saved_regs;
+       u32 saved_regs[];
 };
 
 struct jh7110_gpio_irq_reg {