Skip to contentSkip to conversation

gpio: sim: fix hogs with custom chip labels

PATCH In review Bartosz Golaszewski 2 participants 3 messages Feb 8, 2022 – Feb 9, 2022 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: sim: fix hogs with custom chip labels

We always assign the default device name as the chip_label in hog structures which makes it impossible to assign hogs to chips. Let's first check if a custom label was set and then copy it instead of the default device name.

Fixes cb8c474e79be ("gpio: sim: new testing module")
---
 drivers/gpio/gpio-sim.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/gpio/gpio-sim.c +15 -4
index 04b137eca8da..33df418ea8d1 100644
@@ -570,6 +570,11 @@ static struct gpio_sim_bank *to_gpio_sim_bank(struct config_item *item)
 	return container_of(group, struct gpio_sim_bank, group);
 }
 
+static bool gpio_sim_bank_has_label(struct gpio_sim_bank *bank)
+{
+	return (bank->label && (strlen(bank->label) > 0));
+}
+
 static struct gpio_sim_device *
 gpio_sim_bank_get_device(struct gpio_sim_bank *bank)
 {
@@ -770,9 +775,15 @@ static int gpio_sim_add_hogs(struct gpio_sim_device *dev)
 			 * point the device doesn't exist yet and so dev_name()
 			 * is not available.
 			 */
-			hog->chip_label = kasprintf(GFP_KERNEL,
-						    "gpio-sim.%u-%s", dev->id,
-						    fwnode_get_name(bank->swnode));
+			if (gpio_sim_bank_has_label(bank))
+				hog->chip_label = kstrdup(bank->label,
+							  GFP_KERNEL);
+			else
+				hog->chip_label = kasprintf(GFP_KERNEL,
+							"gpio-sim.%u-%s",
+							dev->id,
+							fwnode_get_name(
+								bank->swnode));
 			if (!hog->chip_label) {
 				gpio_sim_remove_hogs(dev);
 				return -ENOMEM;
@@ -816,7 +827,7 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank,
 
 	properties[prop_idx++] = PROPERTY_ENTRY_U32("ngpios", bank->num_lines);
 
-	if (bank->label && (strlen(bank->label) > 0))
+	if (gpio_sim_bank_has_label(bank))
 		properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label",
 							       bank->label);
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Bartosz Golaszewski

We always assign the default device name as the chip_label in hog structures which makes it impossible to assign hogs to chips. Let's first check if a custom label was set and then copy it instead of the default device name.

...

Quoted 1 line

+ return (bank->label && (strlen(bank->label) > 0));

It can be simply

  return bank->label && strlen(bank->label);

Or even w/o strlen() call:

  return bank->label && *bank->label; // or bank->label && bank->label[0]

Either way the code LGTM,

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 12 lines · Andy Shevchenko
Quoted 5 lines · Bartosz Golaszewski

We always assign the default device name as the chip_label in hog structures which makes it impossible to assign hogs to chips. Let's first check if a custom label was set and then copy it instead of the default device name.

...

Quoted 1 line

+ return (bank->label && (strlen(bank->label) > 0));

Quoted 8 lines

It can be simply

  return bank->label && strlen(bank->label);

Or even w/o strlen() call:

  return bank->label && *bank->label; // or bank->label && bank->label[0]

Yeah makes sense, I will change it when applying.

Bart

Quoted 6 lines

Either way the code LGTM,

--
With Best Regards,
Andy Shevchenko