[PATCH] mfd: twl-core: allocate modules with twl_private
From: Rosen Penev
Date: Mon Jun 29 2026 - 21:31:00 EST
Use a flexible array member to allocate the twl_client array together
with struct twl_private. This removes a separate devm_kcalloc() and
keeps the module data tied to the main private structure.
Signed-off-by: Rosen Penev <rosenp@xxxxxxxxx>
---
drivers/mfd/twl-core.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index c024a28b057e..a7754b7ccae0 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -159,7 +159,7 @@ struct twl_private {
unsigned int twl_id;
struct twl_mapping *twl_map;
- struct twl_client *twl_modules;
+ struct twl_client twl_modules[];
};
static struct twl_private *twl_priv;
@@ -760,7 +760,8 @@ twl_probe(struct i2c_client *client)
goto free;
}
- twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private),
+ num_slaves = twl_get_num_slaves();
+ twl_priv = devm_kzalloc(&client->dev, struct_size(twl_priv, twl_modules, num_slaves),
GFP_KERNEL);
if (!twl_priv) {
status = -ENOMEM;
@@ -777,16 +778,6 @@ twl_probe(struct i2c_client *client)
twl_regmap_config = twl4030_regmap_config;
}
- num_slaves = twl_get_num_slaves();
- twl_priv->twl_modules = devm_kcalloc(&client->dev,
- num_slaves,
- sizeof(struct twl_client),
- GFP_KERNEL);
- if (!twl_priv->twl_modules) {
- status = -ENOMEM;
- goto free;
- }
-
for (i = 0; i < num_slaves; i++) {
struct twl_client *twl = &twl_priv->twl_modules[i];
--
2.54.0