Skip to contentSkip to conversation

gpio: sim: fix the chip_name configfs item

PATCH In review Bartosz Golaszewski 3 participants 3 messages Jul 12, 2022

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

PATCH v2 1/1 gpio: sim: fix the chip_name configfs item

The chip_name configs attribute always displays the device name of the first GPIO bank because the logic of the relevant function is simply wrong.

Fix it by correctly comparing the bank's swnode against the GPIO device's children.

Fixes cb8c474e79be ("gpio: sim: new testing module")

---
v1 -> v2:
- use device_match_fwnode for shorter code

 drivers/gpio/gpio-sim.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/gpio/gpio-sim.c +5 -11
index 98109839102f..1020c2feb249 100644
@@ -991,28 +991,22 @@ static struct configfs_attribute *gpio_sim_device_config_attrs[] = {
 };
 
 struct gpio_sim_chip_name_ctx {
-	struct gpio_sim_device *dev;
+	struct fwnode_handle *swnode;
 	char *page;
 };
 
 static int gpio_sim_emit_chip_name(struct device *dev, void *data)
 {
 	struct gpio_sim_chip_name_ctx *ctx = data;
-	struct fwnode_handle *swnode;
-	struct gpio_sim_bank *bank;
 
 	/* This would be the sysfs device exported in /sys/class/gpio. */
 	if (dev->class)
 		return 0;
 
-	swnode = dev_fwnode(dev);
+	if (device_match_fwnode(dev, ctx->swnode))
+		return sprintf(ctx->page, "%s\n", dev_name(dev));
 
-	list_for_each_entry(bank, &ctx->dev->bank_list, siblings) {
-		if (bank->swnode == swnode)
-			return sprintf(ctx->page, "%s\n", dev_name(dev));
-	}
-
-	return -ENODATA;
+	return 0;
 }
 
 static ssize_t gpio_sim_bank_config_chip_name_show(struct config_item *item,
@@ -1020,7 +1014,7 @@ static ssize_t gpio_sim_bank_config_chip_name_show(struct config_item *item,
 {
 	struct gpio_sim_bank *bank = to_gpio_sim_bank(item);
 	struct gpio_sim_device *dev = gpio_sim_bank_get_device(bank);
-	struct gpio_sim_chip_name_ctx ctx = { dev, page };
+	struct gpio_sim_chip_name_ctx ctx = { bank->swnode, page };
 	int ret;
 
 	mutex_lock(&dev->lock);
Signature · 1 line
2.34.1
#1 lore raw
Quoted 7 lines · Bartosz Golaszewski

The chip_name configs attribute always displays the device name of the first GPIO bank because the logic of the relevant function is simply wrong.

Fix it by correctly comparing the bank's swnode against the GPIO device's children.

Quoted 8 lines
Fixes cb8c474e79be ("gpio: sim: new testing module")

---
v1 -> v2:
- use device_match_fwnode for shorter code

Works for me.

Reviewed-and-tested-by Kent Gibson <[email protected]>

Cheers,
Kent.

Reviewed-by on v2 1/1
#2 lore raw
In reply to Bartosz Golaszewski
Quoted 7 lines · Bartosz Golaszewski

The chip_name configs attribute always displays the device name of the first GPIO bank because the logic of the relevant function is simply wrong.

Fix it by correctly comparing the bank's swnode against the GPIO device's children.

Taking into account that name swnode is used in other places in the code, I'm fine with this version,

Quoted 60 lines
Fixes cb8c474e79be ("gpio: sim: new testing module")

---
v1 -> v2:
- use device_match_fwnode for shorter code

 drivers/gpio/gpio-sim.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/gpio/gpio-sim.c +5 -12
index 98109839102f..1020c2feb249 100644
@@ -991,28 +991,22 @@ static struct configfs_attribute *gpio_sim_device_config_attrs[] = {
 };
 
 struct gpio_sim_chip_name_ctx {
-       struct gpio_sim_device *dev;
+       struct fwnode_handle *swnode;
        char *page;
 };
 
 static int gpio_sim_emit_chip_name(struct device *dev, void *data)
 {
        struct gpio_sim_chip_name_ctx *ctx = data;
-       struct fwnode_handle *swnode;
-       struct gpio_sim_bank *bank;
 
        /* This would be the sysfs device exported in /sys/class/gpio. */
        if (dev->class)
                return 0;
 
-       swnode = dev_fwnode(dev);
+       if (device_match_fwnode(dev, ctx->swnode))
+               return sprintf(ctx->page, "%s\n", dev_name(dev));
 
-       list_for_each_entry(bank, &ctx->dev->bank_list, siblings) {
-               if (bank->swnode == swnode)
-                       return sprintf(ctx->page, "%s\n", dev_name(dev));
-       }
-
-       return -ENODATA;
+       return 0;
 }
 
 static ssize_t gpio_sim_bank_config_chip_name_show(struct config_item *item,
@@ -1020,7 +1014,7 @@ static ssize_t gpio_sim_bank_config_chip_name_show(struct config_item *item,
 {
        struct gpio_sim_bank *bank = to_gpio_sim_bank(item);
        struct gpio_sim_device *dev = gpio_sim_bank_get_device(bank);
-       struct gpio_sim_chip_name_ctx ctx = { dev, page };
+       struct gpio_sim_chip_name_ctx ctx = { bank->swnode, page };
        int ret;
 
        mutex_lock(&dev->lock);
--

2.34.1

Signature · 2 lines
With Best Regards,
Andy Shevchenko