pinctrl: sophgo: allocate power_cfg with priv

[PATCH] pinctrl: sophgo: allocate power_cfg with priv

Posted by Rosen Penev 1 month, 2 weeks ago

Use a flexible array member to combine allocations and simplify code
slightly.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/pinctrl/sophgo/pinctrl-cv18xx.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
index c3a2dcf71f2a..154ba9a4f08c 100644
--- a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
+++ b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
@@ -27,8 +27,8 @@
 #include "pinctrl-cv18xx.h"
 
 struct cv1800_priv {
-	u32					*power_cfg;
 	void __iomem				*regs[2];
+	u32					power_cfg[];
 };
 
 static unsigned int cv1800_dt_get_pin_mux(u32 value)
@@ -417,15 +417,11 @@ static int cv1800_pinctrl_init(struct platform_device *pdev,
 	const struct sophgo_pinctrl_data *pctrl_data = pctrl->data;
 	struct cv1800_priv *priv;
 
-	priv = devm_kzalloc(&pdev->dev, sizeof(struct cv1800_priv), GFP_KERNEL);
+	priv = devm_kzalloc(&pdev->dev, struct_size(priv, power_cfg, pctrl_data->npds),
+			GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
 
-	priv->power_cfg = devm_kcalloc(&pdev->dev, pctrl_data->npds,
-				       sizeof(u32), GFP_KERNEL);
-	if (!priv->power_cfg)
-		return -ENOMEM;
-
 	priv->regs[0] = devm_platform_ioremap_resource_byname(pdev, "sys");
 	if (IS_ERR(priv->regs[0]))
 		return PTR_ERR(priv->regs[0]);
-- 
2.54.0

Re: [PATCH] pinctrl: sophgo: allocate power_cfg with priv

Posted by Linus Walleij 1 month, 1 week ago

Hi Rosen,

thanks for your patch!

On Fri, May 1, 2026 at 12:04 AM Rosen Penev <rosenp@gmail.com> wrote:

> Use a flexible array member to combine allocations and simplify code
> slightly.
>
> Signed-off-by: Rosen Penev <rosenp@gmail.com>

I have applied the patch with the following augmentation:

iff --git a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
index 154ba9a4f08c..59318a42690f 100644
--- a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
+++ b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
@@ -27,8 +27,9 @@
 #include "pinctrl-cv18xx.h"

 struct cv1800_priv {
-       void __iomem                            *regs[2];
-       u32                                     power_cfg[];
+       void __iomem    *regs[2];
+       unsigned int    num_power_cfg;
+       u32             power_cfg[] __counted_by(num_power_cfg);
 };

 static unsigned int cv1800_dt_get_pin_mux(u32 value)
@@ -421,6 +422,7 @@ static int cv1800_pinctrl_init(struct platform_device *pdev,
                        GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
+       priv->num_power_cfg = pctrl_data->npds;

        priv->regs[0] = devm_platform_ioremap_resource_byname(pdev, "sys");
        if (IS_ERR(priv->regs[0]))

I think this has been mentioned before?

Including a counter for dynamic arrays makes it possible for the
compiler to insert runtime checks akin to those that are used for
Pascal or Rust arrays making it harder for the arrays to be indexed
out of range.

Yours,
Linus Walleij