Skip to contentSkip to conversation

mfd: twl-core: Allocate modules with twl_private

PATCH In review Rosen Penev 3 participants 5 messages Sep 26 – Oct 16

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 mfd: twl-core: Allocate modules with twl_private

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.

---
v3: Capitalize Allocate.
v2: don't use twl_get_num_slaves().

 drivers/mfd/twl-core.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/mfd/twl-core.c +4 -12
index f86df356d658..0b78fe30e047 100644
@@ -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;
@@ -770,7 +770,9 @@ twl_probe(struct i2c_client *client)
 		goto out;
 	}
 
-	twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private),
+	num_slaves = (id->driver_data & TWL6030_CLASS) ? 3 : 4;
+	twl_priv = devm_kzalloc(&client->dev,
+				struct_size(twl_priv, twl_modules, num_slaves),
 				GFP_KERNEL);
 	if (!twl_priv) {
 		status = -ENOMEM;
@@ -787,16 +789,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 out;
-	}
-
 	for (i = 0; i < num_slaves; i++) {
 		struct twl_client *twl = &twl_priv->twl_modules[i];
 
Signature · 1 line
2.55.0
#1 lore raw
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 5 lines

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.

Sashiko has reviewed this patch and found no issues. It looks great!

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
maintainer
#2 lore raw
In reply to Rosen Penev
Quoted 25 lines · Rosen Penev

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.

---
v3: Capitalize Allocate.
v2: don't use twl_get_num_slaves().

 drivers/mfd/twl-core.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/mfd/twl-core.c +1 -1
index f86df356d658..0b78fe30e047 100644
@@ -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;

drivers/mfd/twl-core.c twl_probe(struct i2c_client *client) · line 773

Quoted 5 lines
drivers/mfd/twl-core.c +1 -1
@@ -770,7 +770,9 @@ twl_probe(struct i2c_client *client)
 		goto out;
 	}
 
-	twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private),
+	num_slaves = (id->driver_data & TWL6030_CLASS) ? 3 : 4;

What's wrong with twl_get_num_slaves()?

Quoted 25 lines
drivers/mfd/twl-core.c +2 -10
+	twl_priv = devm_kzalloc(&client->dev,
+				struct_size(twl_priv, twl_modules, num_slaves),
 				GFP_KERNEL);
 	if (!twl_priv) {
 		status = -ENOMEM;
@@ -787,16 +789,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 out;
-	}
-
 	for (i = 0; i < num_slaves; i++) {
 		struct twl_client *twl = &twl_priv->twl_modules[i];
 
Signature · 1 line
2.55.0
Signature · 1 line
Lee Jones
#3 lore raw
Quoted 31 lines · Lee Jones
Quoted 28 lines · Rosen Penev

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.

---
v3: Capitalize Allocate.
v2: don't use twl_get_num_slaves().

 drivers/mfd/twl-core.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/mfd/twl-core.c +1 -1
index f86df356d658..0b78fe30e047 100644
@@ -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;
@@ -770,7 +770,9 @@ twl_probe(struct i2c_client *client)
              goto out;
      }
 
Quoted 4 lines

drivers/mfd/twl-core.c twl_probe(struct i2c_client *client) · line 773

Quoted 2 lines
drivers/mfd/twl-core.c +1 -1
-     twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private),
+     num_slaves = (id->driver_data & TWL6030_CLASS) ? 3 : 4;

What's wrong with twl_get_num_slaves()?

It relies on twl_priv already being allocated.

Quoted 29 lines
Quoted 24 lines
drivers/mfd/twl-core.c +2 -11
+     twl_priv = devm_kzalloc(&client->dev,
+                             struct_size(twl_priv, twl_modules, num_slaves),
                              GFP_KERNEL);
      if (!twl_priv) {
              status = -ENOMEM;
@@ -787,16 +789,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 out;
-     }
-
      for (i = 0; i < num_slaves; i++) {
              struct twl_client *twl = &twl_priv->twl_modules[i];
 
--
Quoted 2 lines

2.55.0

--
Lee Jones

maintainer
#4 lore raw

--- checkpatch.pl (3 issues) ---
Line 4: ERROR: Invalid commit separator - some tools may have problems applying this Line 32: WARNING: please, no spaces at the start of a line
Line 41: WARNING: please, no spaces at the start of a line
----------------------------------

--- checkpatch.pl (2 issues) ---
Line 27: WARNING: please, no spaces at the start of a line Line 36: WARNING: please, no spaces at the start of a line
----------------------------------

Quoted 32 lines · Rosen Penev
Quoted 31 lines · Lee Jones
Quoted 28 lines · Rosen Penev

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.

---
v3: Capitalize Allocate.
v2: don't use twl_get_num_slaves().

 drivers/mfd/twl-core.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/mfd/twl-core.c +1 -1
index f86df356d658..0b78fe30e047 100644
@@ -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;
@@ -770,7 +770,9 @@ twl_probe(struct i2c_client *client)
              goto out;
      }
 
Quoted 5 lines
Quoted 4 lines

drivers/mfd/twl-core.c twl_probe(struct i2c_client *client) · line 773

Quoted 2 lines
drivers/mfd/twl-core.c +1 -1
-     twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private),
+     num_slaves = (id->driver_data & TWL6030_CLASS) ? 3 : 4;

What's wrong with twl_get_num_slaves()?

It relies on twl_priv already being allocated.

IMHO, this is too much hoop jumping to save on one pointer. Code cleanliness remains much more important here. And don't even get me started on that mess in include/linux/mfd/twl.h !

Just define TWL_MAX_SLAVES as 4 and have done:

        struct twl_client twl_modules[TWL_MAX_SLAVES];
Quoted 28 lines
Quoted 28 lines
Quoted 23 lines
drivers/mfd/twl-core.c +2 -11
+     twl_priv = devm_kzalloc(&client->dev,
+                             struct_size(twl_priv, twl_modules, num_slaves),
                              GFP_KERNEL);
      if (!twl_priv) {
              status = -ENOMEM;
@@ -787,16 +789,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 out;
-     }
-
      for (i = 0; i < num_slaves; i++) {
              struct twl_client *twl = &twl_priv->twl_modules[i];
 
--
Quoted 2 lines

2.55.0

--
Lee Jones

Signature · 1 line
Lee Jones