* [PATCH] leds: pca955x: kzalloc + kcalloc to single kzalloc
@ 2026-03-20 4:08 Rosen Penev
2026-03-26 11:33 ` Lee Jones
0 siblings, 1 reply; 5+ messages in thread
From: Rosen Penev @ 2026-03-20 4:08 UTC (permalink / raw)
To: linux-leds
Cc: Lee Jones, Pavel Machek, Kees Cook, Gustavo A. R. Silva,
open list,
open list:KERNEL HARDENING (not covered by other areas):Keyword:b__counted_by(_le|_be)?b
Two fewer allocations as a result.
Required placing some structs before others as flexible array members
require a complete definition. Declaration is not enough.
Added __counted_by support for one of the structs for extra runtime
analysis.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/leds/leds-pca955x.c | 45 ++++++++++++++-----------------------
1 file changed, 17 insertions(+), 28 deletions(-)
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 2007fe6217ec..ee5f02eaa3c9 100644
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -112,19 +112,6 @@ static const struct pca955x_chipdef pca955x_chipdefs[] = {
},
};
-struct pca955x {
- struct mutex lock;
- struct pca955x_led *leds;
- const struct pca955x_chipdef *chipdef;
- struct i2c_client *client;
- unsigned long active_blink;
- unsigned long active_pins;
- unsigned long blink_period;
-#ifdef CONFIG_LEDS_PCA955X_GPIO
- struct gpio_chip gpio;
-#endif
-};
-
struct pca955x_led {
struct pca955x *pca955x;
struct led_classdev led_cdev;
@@ -137,8 +124,21 @@ struct pca955x_led {
#define led_to_pca955x(l) container_of(l, struct pca955x_led, led_cdev)
struct pca955x_platform_data {
- struct pca955x_led *leds;
int num_leds;
+ struct pca955x_led leds[] __counted_by(num_leds);
+};
+
+struct pca955x {
+ struct mutex lock;
+ const struct pca955x_chipdef *chipdef;
+ struct i2c_client *client;
+ unsigned long active_blink;
+ unsigned long active_pins;
+ unsigned long blink_period;
+#ifdef CONFIG_LEDS_PCA955X_GPIO
+ struct gpio_chip gpio;
+#endif
+ struct pca955x_led leds[];
};
/* 8 bits per input register */
@@ -542,15 +542,11 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
if (count > chip->bits)
return ERR_PTR(-ENODEV);
- pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
+ pdata = devm_kzalloc(&client->dev, struct_size(pdata, leds, chip->bits), GFP_KERNEL);
if (!pdata)
return ERR_PTR(-ENOMEM);
- pdata->leds = devm_kcalloc(&client->dev,
- chip->bits, sizeof(struct pca955x_led),
- GFP_KERNEL);
- if (!pdata->leds)
- return ERR_PTR(-ENOMEM);
+ pdata->num_leds = chip->bits;
device_for_each_child_node(&client->dev, child) {
u32 reg;
@@ -568,8 +564,6 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
fwnode_property_read_u32(child, "type", &led->type);
}
- pdata->num_leds = chip->bits;
-
return pdata;
}
@@ -623,15 +617,10 @@ static int pca955x_probe(struct i2c_client *client)
return -ENODEV;
}
- pca955x = devm_kzalloc(&client->dev, sizeof(*pca955x), GFP_KERNEL);
+ pca955x = devm_kzalloc(&client->dev, struct_size(pca955x, leds, chip->bits), GFP_KERNEL);
if (!pca955x)
return -ENOMEM;
- pca955x->leds = devm_kcalloc(&client->dev, chip->bits,
- sizeof(*pca955x_led), GFP_KERNEL);
- if (!pca955x->leds)
- return -ENOMEM;
-
i2c_set_clientdata(client, pca955x);
mutex_init(&pca955x->lock);
--
2.53.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: pca955x: kzalloc + kcalloc to single kzalloc
2026-03-20 4:08 [PATCH] leds: pca955x: kzalloc + kcalloc to single kzalloc Rosen Penev
@ 2026-03-26 11:33 ` Lee Jones
2026-03-26 19:04 ` Rosen Penev
0 siblings, 1 reply; 5+ messages in thread
From: Lee Jones @ 2026-03-26 11:33 UTC (permalink / raw)
To: Rosen Penev
Cc: linux-leds, Pavel Machek, Kees Cook, Gustavo A. R. Silva,
open list,
open list:KERNEL HARDENING (not covered by other areas):Keyword:b__counted_by(_le|_be)?b
On Thu, 19 Mar 2026, Rosen Penev wrote:
> Two fewer allocations as a result.
>
> Required placing some structs before others as flexible array members
> require a complete definition. Declaration is not enough.
>
> Added __counted_by support for one of the structs for extra runtime
> analysis.
>
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---
> drivers/leds/leds-pca955x.c | 45 ++++++++++++++-----------------------
> 1 file changed, 17 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
> index 2007fe6217ec..ee5f02eaa3c9 100644
> --- a/drivers/leds/leds-pca955x.c
> +++ b/drivers/leds/leds-pca955x.c
> @@ -112,19 +112,6 @@ static const struct pca955x_chipdef pca955x_chipdefs[] = {
> },
> };
>
> -struct pca955x {
> - struct mutex lock;
> - struct pca955x_led *leds;
> - const struct pca955x_chipdef *chipdef;
> - struct i2c_client *client;
> - unsigned long active_blink;
> - unsigned long active_pins;
> - unsigned long blink_period;
> -#ifdef CONFIG_LEDS_PCA955X_GPIO
> - struct gpio_chip gpio;
> -#endif
> -};
> -
> struct pca955x_led {
> struct pca955x *pca955x;
> struct led_classdev led_cdev;
> @@ -137,8 +124,21 @@ struct pca955x_led {
> #define led_to_pca955x(l) container_of(l, struct pca955x_led, led_cdev)
>
> struct pca955x_platform_data {
> - struct pca955x_led *leds;
> int num_leds;
> + struct pca955x_led leds[] __counted_by(num_leds);
Where is the memory allocated to this now?
Why do we need this in both structs?
> +};
> +
> +struct pca955x {
> + struct mutex lock;
> + const struct pca955x_chipdef *chipdef;
> + struct i2c_client *client;
> + unsigned long active_blink;
> + unsigned long active_pins;
> + unsigned long blink_period;
> +#ifdef CONFIG_LEDS_PCA955X_GPIO
> + struct gpio_chip gpio;
> +#endif
> + struct pca955x_led leds[];
> };
>
> /* 8 bits per input register */
> @@ -542,15 +542,11 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> if (count > chip->bits)
> return ERR_PTR(-ENODEV);
>
> - pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
> + pdata = devm_kzalloc(&client->dev, struct_size(pdata, leds, chip->bits), GFP_KERNEL);
> if (!pdata)
> return ERR_PTR(-ENOMEM);
>
> - pdata->leds = devm_kcalloc(&client->dev,
> - chip->bits, sizeof(struct pca955x_led),
> - GFP_KERNEL);
> - if (!pdata->leds)
> - return ERR_PTR(-ENOMEM);
> + pdata->num_leds = chip->bits;
>
> device_for_each_child_node(&client->dev, child) {
> u32 reg;
> @@ -568,8 +564,6 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> fwnode_property_read_u32(child, "type", &led->type);
> }
>
> - pdata->num_leds = chip->bits;
> -
> return pdata;
> }
>
> @@ -623,15 +617,10 @@ static int pca955x_probe(struct i2c_client *client)
> return -ENODEV;
> }
>
> - pca955x = devm_kzalloc(&client->dev, sizeof(*pca955x), GFP_KERNEL);
> + pca955x = devm_kzalloc(&client->dev, struct_size(pca955x, leds, chip->bits), GFP_KERNEL);
> if (!pca955x)
> return -ENOMEM;
>
> - pca955x->leds = devm_kcalloc(&client->dev, chip->bits,
> - sizeof(*pca955x_led), GFP_KERNEL);
> - if (!pca955x->leds)
> - return -ENOMEM;
> -
> i2c_set_clientdata(client, pca955x);
>
> mutex_init(&pca955x->lock);
> --
> 2.53.0
>
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: pca955x: kzalloc + kcalloc to single kzalloc
2026-03-26 11:33 ` Lee Jones
@ 2026-03-26 19:04 ` Rosen Penev
2026-04-09 12:44 ` Lee Jones
0 siblings, 1 reply; 5+ messages in thread
From: Rosen Penev @ 2026-03-26 19:04 UTC (permalink / raw)
To: Lee Jones
Cc: linux-leds, Pavel Machek, Kees Cook, Gustavo A. R. Silva,
open list,
open list:KERNEL HARDENING (not covered by other areas):Keyword:b__counted_by(_le|_be)?b
On Thu, Mar 26, 2026 at 4:33 AM Lee Jones <lee@kernel.org> wrote:
>
> On Thu, 19 Mar 2026, Rosen Penev wrote:
>
> > Two fewer allocations as a result.
> >
> > Required placing some structs before others as flexible array members
> > require a complete definition. Declaration is not enough.
> >
> > Added __counted_by support for one of the structs for extra runtime
> > analysis.
> >
> > Signed-off-by: Rosen Penev <rosenp@gmail.com>
> > ---
> > drivers/leds/leds-pca955x.c | 45 ++++++++++++++-----------------------
> > 1 file changed, 17 insertions(+), 28 deletions(-)
> >
> > diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
> > index 2007fe6217ec..ee5f02eaa3c9 100644
> > --- a/drivers/leds/leds-pca955x.c
> > +++ b/drivers/leds/leds-pca955x.c
> > @@ -112,19 +112,6 @@ static const struct pca955x_chipdef pca955x_chipdefs[] = {
> > },
> > };
> >
> > -struct pca955x {
> > - struct mutex lock;
> > - struct pca955x_led *leds;
> > - const struct pca955x_chipdef *chipdef;
> > - struct i2c_client *client;
> > - unsigned long active_blink;
> > - unsigned long active_pins;
> > - unsigned long blink_period;
> > -#ifdef CONFIG_LEDS_PCA955X_GPIO
> > - struct gpio_chip gpio;
> > -#endif
> > -};
> > -
> > struct pca955x_led {
> > struct pca955x *pca955x;
> > struct led_classdev led_cdev;
> > @@ -137,8 +124,21 @@ struct pca955x_led {
> > #define led_to_pca955x(l) container_of(l, struct pca955x_led, led_cdev)
> >
> > struct pca955x_platform_data {
> > - struct pca955x_led *leds;
> > int num_leds;
> > + struct pca955x_led leds[] __counted_by(num_leds);
>
> Where is the memory allocated to this now?
The kzalloc call was updated to use struct_size to allocate it
together with the struct.
>
> Why do we need this in both structs?
kzalloc and kcalloc can be combined in both locations.
>
> > +};
> > +
> > +struct pca955x {
> > + struct mutex lock;
> > + const struct pca955x_chipdef *chipdef;
> > + struct i2c_client *client;
> > + unsigned long active_blink;
> > + unsigned long active_pins;
> > + unsigned long blink_period;
> > +#ifdef CONFIG_LEDS_PCA955X_GPIO
> > + struct gpio_chip gpio;
> > +#endif
> > + struct pca955x_led leds[];
> > };
> >
> > /* 8 bits per input register */
> > @@ -542,15 +542,11 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> > if (count > chip->bits)
> > return ERR_PTR(-ENODEV);
> >
> > - pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
> > + pdata = devm_kzalloc(&client->dev, struct_size(pdata, leds, chip->bits), GFP_KERNEL);
> > if (!pdata)
> > return ERR_PTR(-ENOMEM);
> >
> > - pdata->leds = devm_kcalloc(&client->dev,
> > - chip->bits, sizeof(struct pca955x_led),
> > - GFP_KERNEL);
> > - if (!pdata->leds)
> > - return ERR_PTR(-ENOMEM);
> > + pdata->num_leds = chip->bits;
> >
> > device_for_each_child_node(&client->dev, child) {
> > u32 reg;
> > @@ -568,8 +564,6 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> > fwnode_property_read_u32(child, "type", &led->type);
> > }
> >
> > - pdata->num_leds = chip->bits;
> > -
> > return pdata;
> > }
> >
> > @@ -623,15 +617,10 @@ static int pca955x_probe(struct i2c_client *client)
> > return -ENODEV;
> > }
> >
> > - pca955x = devm_kzalloc(&client->dev, sizeof(*pca955x), GFP_KERNEL);
> > + pca955x = devm_kzalloc(&client->dev, struct_size(pca955x, leds, chip->bits), GFP_KERNEL);
> > if (!pca955x)
> > return -ENOMEM;
> >
> > - pca955x->leds = devm_kcalloc(&client->dev, chip->bits,
> > - sizeof(*pca955x_led), GFP_KERNEL);
> > - if (!pca955x->leds)
> > - return -ENOMEM;
> > -
> > i2c_set_clientdata(client, pca955x);
> >
> > mutex_init(&pca955x->lock);
> > --
> > 2.53.0
> >
>
> --
> Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: pca955x: kzalloc + kcalloc to single kzalloc
2026-03-26 19:04 ` Rosen Penev
@ 2026-04-09 12:44 ` Lee Jones
2026-04-09 17:32 ` Rosen Penev
0 siblings, 1 reply; 5+ messages in thread
From: Lee Jones @ 2026-04-09 12:44 UTC (permalink / raw)
To: Rosen Penev
Cc: linux-leds, Pavel Machek, Kees Cook, Gustavo A. R. Silva,
open list,
open list:KERNEL HARDENING (not covered by other areas):Keyword:b__counted_by(_le|_be)?b
On Thu, 26 Mar 2026, Rosen Penev wrote:
> On Thu, Mar 26, 2026 at 4:33 AM Lee Jones <lee@kernel.org> wrote:
> >
> > On Thu, 19 Mar 2026, Rosen Penev wrote:
> >
> > > Two fewer allocations as a result.
> > >
> > > Required placing some structs before others as flexible array members
> > > require a complete definition. Declaration is not enough.
> > >
> > > Added __counted_by support for one of the structs for extra runtime
> > > analysis.
> > >
> > > Signed-off-by: Rosen Penev <rosenp@gmail.com>
> > > ---
> > > drivers/leds/leds-pca955x.c | 45 ++++++++++++++-----------------------
> > > 1 file changed, 17 insertions(+), 28 deletions(-)
> > >
> > > diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
> > > index 2007fe6217ec..ee5f02eaa3c9 100644
> > > --- a/drivers/leds/leds-pca955x.c
> > > +++ b/drivers/leds/leds-pca955x.c
> > > @@ -112,19 +112,6 @@ static const struct pca955x_chipdef pca955x_chipdefs[] = {
> > > },
> > > };
> > >
> > > -struct pca955x {
> > > - struct mutex lock;
> > > - struct pca955x_led *leds;
> > > - const struct pca955x_chipdef *chipdef;
> > > - struct i2c_client *client;
> > > - unsigned long active_blink;
> > > - unsigned long active_pins;
> > > - unsigned long blink_period;
> > > -#ifdef CONFIG_LEDS_PCA955X_GPIO
> > > - struct gpio_chip gpio;
> > > -#endif
> > > -};
> > > -
> > > struct pca955x_led {
> > > struct pca955x *pca955x;
> > > struct led_classdev led_cdev;
> > > @@ -137,8 +124,21 @@ struct pca955x_led {
> > > #define led_to_pca955x(l) container_of(l, struct pca955x_led, led_cdev)
> > >
> > > struct pca955x_platform_data {
> > > - struct pca955x_led *leds;
> > > int num_leds;
> > > + struct pca955x_led leds[] __counted_by(num_leds);
I'm not sure we should we be embedding the full 'struct pca955x_led'
(which contains runtime framework structures like 'struct led_classdev')
directly inside the platform data? Besides platform data should ideally
be restricted to static configuration properties rather than runtime
state.
> > Where is the memory allocated to this now?
> The kzalloc call was updated to use struct_size to allocate it
> together with the struct.
> >
> > Why do we need this in both structs?
> kzalloc and kcalloc can be combined in both locations.
I believe my original question might have been misunderstood. I was
asking about the architectural design choice. Why does the same 'leds'
array need to exist in both the 'pca955x' runtime structure and the
'pca955x_platform_data' configuration structure? Could we look at
eliminating this redundancy to avoid storing duplicate data?
> >
> > > +};
> > > +
> > > +struct pca955x {
> > > + struct mutex lock;
> > > + const struct pca955x_chipdef *chipdef;
> > > + struct i2c_client *client;
> > > + unsigned long active_blink;
> > > + unsigned long active_pins;
> > > + unsigned long blink_period;
> > > +#ifdef CONFIG_LEDS_PCA955X_GPIO
> > > + struct gpio_chip gpio;
> > > +#endif
#ifdef statements are to be avoided in C files.
Please find another way to do this (if it's required).
> > > + struct pca955x_led leds[];
> > > };
> > >
> > > /* 8 bits per input register */
> > > @@ -542,15 +542,11 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> > > if (count > chip->bits)
> > > return ERR_PTR(-ENODEV);
> > >
> > > - pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
> > > + pdata = devm_kzalloc(&client->dev, struct_size(pdata, leds, chip->bits), GFP_KERNEL);
> > > if (!pdata)
> > > return ERR_PTR(-ENOMEM);
> > >
> > > - pdata->leds = devm_kcalloc(&client->dev,
> > > - chip->bits, sizeof(struct pca955x_led),
> > > - GFP_KERNEL);
> > > - if (!pdata->leds)
> > > - return ERR_PTR(-ENOMEM);
> > > + pdata->num_leds = chip->bits;
> > >
> > > device_for_each_child_node(&client->dev, child) {
> > > u32 reg;
> > > @@ -568,8 +564,6 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> > > fwnode_property_read_u32(child, "type", &led->type);
> > > }
> > >
> > > - pdata->num_leds = chip->bits;
> > > -
> > > return pdata;
> > > }
> > >
> > > @@ -623,15 +617,10 @@ static int pca955x_probe(struct i2c_client *client)
> > > return -ENODEV;
> > > }
> > >
> > > - pca955x = devm_kzalloc(&client->dev, sizeof(*pca955x), GFP_KERNEL);
> > > + pca955x = devm_kzalloc(&client->dev, struct_size(pca955x, leds, chip->bits), GFP_KERNEL);
> > > if (!pca955x)
> > > return -ENOMEM;
> > >
> > > - pca955x->leds = devm_kcalloc(&client->dev, chip->bits,
> > > - sizeof(*pca955x_led), GFP_KERNEL);
> > > - if (!pca955x->leds)
> > > - return -ENOMEM;
> > > -
> > > i2c_set_clientdata(client, pca955x);
> > >
> > > mutex_init(&pca955x->lock);
> > > --
> > > 2.53.0
> > >
> >
> > --
> > Lee Jones [李琼斯]
>
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] leds: pca955x: kzalloc + kcalloc to single kzalloc
2026-04-09 12:44 ` Lee Jones
@ 2026-04-09 17:32 ` Rosen Penev
0 siblings, 0 replies; 5+ messages in thread
From: Rosen Penev @ 2026-04-09 17:32 UTC (permalink / raw)
To: Lee Jones
Cc: linux-leds, Pavel Machek, Kees Cook, Gustavo A. R. Silva,
open list,
open list:KERNEL HARDENING (not covered by other areas):Keyword:b__counted_by(_le|_be)?b
On Thu, Apr 9, 2026 at 5:44 AM Lee Jones <lee@kernel.org> wrote:
>
> On Thu, 26 Mar 2026, Rosen Penev wrote:
>
> > On Thu, Mar 26, 2026 at 4:33 AM Lee Jones <lee@kernel.org> wrote:
> > >
> > > On Thu, 19 Mar 2026, Rosen Penev wrote:
> > >
> > > > Two fewer allocations as a result.
> > > >
> > > > Required placing some structs before others as flexible array members
> > > > require a complete definition. Declaration is not enough.
> > > >
> > > > Added __counted_by support for one of the structs for extra runtime
> > > > analysis.
> > > >
> > > > Signed-off-by: Rosen Penev <rosenp@gmail.com>
> > > > ---
> > > > drivers/leds/leds-pca955x.c | 45 ++++++++++++++-----------------------
> > > > 1 file changed, 17 insertions(+), 28 deletions(-)
> > > >
> > > > diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
> > > > index 2007fe6217ec..ee5f02eaa3c9 100644
> > > > --- a/drivers/leds/leds-pca955x.c
> > > > +++ b/drivers/leds/leds-pca955x.c
> > > > @@ -112,19 +112,6 @@ static const struct pca955x_chipdef pca955x_chipdefs[] = {
> > > > },
> > > > };
> > > >
> > > > -struct pca955x {
> > > > - struct mutex lock;
> > > > - struct pca955x_led *leds;
> > > > - const struct pca955x_chipdef *chipdef;
> > > > - struct i2c_client *client;
> > > > - unsigned long active_blink;
> > > > - unsigned long active_pins;
> > > > - unsigned long blink_period;
> > > > -#ifdef CONFIG_LEDS_PCA955X_GPIO
> > > > - struct gpio_chip gpio;
> > > > -#endif
> > > > -};
> > > > -
> > > > struct pca955x_led {
> > > > struct pca955x *pca955x;
> > > > struct led_classdev led_cdev;
> > > > @@ -137,8 +124,21 @@ struct pca955x_led {
> > > > #define led_to_pca955x(l) container_of(l, struct pca955x_led, led_cdev)
> > > >
> > > > struct pca955x_platform_data {
> > > > - struct pca955x_led *leds;
> > > > int num_leds;
> > > > + struct pca955x_led leds[] __counted_by(num_leds);
>
> I'm not sure we should we be embedding the full 'struct pca955x_led'
> (which contains runtime framework structures like 'struct led_classdev')
> directly inside the platform data? Besides platform data should ideally
> be restricted to static configuration properties rather than runtime
> state.
>
> > > Where is the memory allocated to this now?
> > The kzalloc call was updated to use struct_size to allocate it
> > together with the struct.
> > >
> > > Why do we need this in both structs?
> > kzalloc and kcalloc can be combined in both locations.
>
> I believe my original question might have been misunderstood. I was
> asking about the architectural design choice. Why does the same 'leds'
> array need to exist in both the 'pca955x' runtime structure and the
> 'pca955x_platform_data' configuration structure? Could we look at
> eliminating this redundancy to avoid storing duplicate data?
From what I see, this bit of code handles missing pdata.
>
> > >
> > > > +};
> > > > +
> > > > +struct pca955x {
> > > > + struct mutex lock;
> > > > + const struct pca955x_chipdef *chipdef;
> > > > + struct i2c_client *client;
> > > > + unsigned long active_blink;
> > > > + unsigned long active_pins;
> > > > + unsigned long blink_period;
> > > > +#ifdef CONFIG_LEDS_PCA955X_GPIO
> > > > + struct gpio_chip gpio;
> > > > +#endif
>
> #ifdef statements are to be avoided in C files.
>
> Please find another way to do this (if it's required).
This is not my code.
>
> > > > + struct pca955x_led leds[];
> > > > };
> > > >
> > > > /* 8 bits per input register */
> > > > @@ -542,15 +542,11 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> > > > if (count > chip->bits)
> > > > return ERR_PTR(-ENODEV);
> > > >
> > > > - pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
> > > > + pdata = devm_kzalloc(&client->dev, struct_size(pdata, leds, chip->bits), GFP_KERNEL);
> > > > if (!pdata)
> > > > return ERR_PTR(-ENOMEM);
> > > >
> > > > - pdata->leds = devm_kcalloc(&client->dev,
> > > > - chip->bits, sizeof(struct pca955x_led),
> > > > - GFP_KERNEL);
> > > > - if (!pdata->leds)
> > > > - return ERR_PTR(-ENOMEM);
> > > > + pdata->num_leds = chip->bits;
> > > >
> > > > device_for_each_child_node(&client->dev, child) {
> > > > u32 reg;
> > > > @@ -568,8 +564,6 @@ pca955x_get_pdata(struct i2c_client *client, const struct pca955x_chipdef *chip)
> > > > fwnode_property_read_u32(child, "type", &led->type);
> > > > }
> > > >
> > > > - pdata->num_leds = chip->bits;
> > > > -
> > > > return pdata;
> > > > }
> > > >
> > > > @@ -623,15 +617,10 @@ static int pca955x_probe(struct i2c_client *client)
> > > > return -ENODEV;
> > > > }
> > > >
> > > > - pca955x = devm_kzalloc(&client->dev, sizeof(*pca955x), GFP_KERNEL);
> > > > + pca955x = devm_kzalloc(&client->dev, struct_size(pca955x, leds, chip->bits), GFP_KERNEL);
> > > > if (!pca955x)
> > > > return -ENOMEM;
> > > >
> > > > - pca955x->leds = devm_kcalloc(&client->dev, chip->bits,
> > > > - sizeof(*pca955x_led), GFP_KERNEL);
> > > > - if (!pca955x->leds)
> > > > - return -ENOMEM;
> > > > -
> > > > i2c_set_clientdata(client, pca955x);
> > > >
> > > > mutex_init(&pca955x->lock);
> > > > --
> > > > 2.53.0
> > > >
> > >
> > > --
> > > Lee Jones [李琼斯]
> >
>
> --
> Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-04-09 17:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-20 4:08 [PATCH] leds: pca955x: kzalloc + kcalloc to single kzalloc Rosen Penev
2026-03-26 11:33 ` Lee Jones
2026-03-26 19:04 ` Rosen Penev
2026-04-09 12:44 ` Lee Jones
2026-04-09 17:32 ` Rosen Penev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox