Skip to contentSkip to conversation

gpio: sim: Use %pfwP specifier instead of calling fwnode API directly

PATCH Applied Andy Shevchenko 2 participants 2 messages Feb 12, 2023 – Feb 13, 2023 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: sim: Use %pfwP specifier instead of calling fwnode API directly

Instead of calling fwnode_get_name() and supply as %s, use %pfwP which will do the same inside printf() call.

---
 drivers/gpio/gpio-sim.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpio/gpio-sim.c +4 -5
index 60514bc5454f..a51b5ea38ad5 100644
@@ -377,8 +377,8 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev)
 
 	ret = fwnode_property_read_string(swnode, "gpio-sim,label", &label);
 	if (ret) {
-		label = devm_kasprintf(dev, GFP_KERNEL, "%s-%s",
-				       dev_name(dev), fwnode_get_name(swnode));
+		label = devm_kasprintf(dev, GFP_KERNEL, "%s-%pfwP",
+				       dev_name(dev), swnode);
 		if (!label)
 			return -ENOMEM;
 	}
@@ -784,10 +784,9 @@ static int gpio_sim_add_hogs(struct gpio_sim_device *dev)
 							  GFP_KERNEL);
 			else
 				hog->chip_label = kasprintf(GFP_KERNEL,
-							"gpio-sim.%u-%s",
+							"gpio-sim.%u-%pfwP",
 							dev->id,
-							fwnode_get_name(
-								bank->swnode));
+							bank->swnode);
 			if (!hog->chip_label) {
 				gpio_sim_remove_hogs(dev);
 				return -ENOMEM;
Signature · 1 line
2.39.1
#1 lore raw
Quoted 38 lines · Andy Shevchenko

Instead of calling fwnode_get_name() and supply as %s, use %pfwP which will do the same inside printf() call.

---
 drivers/gpio/gpio-sim.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpio/gpio-sim.c +4 -6
index 60514bc5454f..a51b5ea38ad5 100644
@@ -377,8 +377,8 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev)
 
        ret = fwnode_property_read_string(swnode, "gpio-sim,label", &label);
        if (ret) {
-               label = devm_kasprintf(dev, GFP_KERNEL, "%s-%s",
-                                      dev_name(dev), fwnode_get_name(swnode));
+               label = devm_kasprintf(dev, GFP_KERNEL, "%s-%pfwP",
+                                      dev_name(dev), swnode);
                if (!label)
                        return -ENOMEM;
        }
@@ -784,10 +784,9 @@ static int gpio_sim_add_hogs(struct gpio_sim_device *dev)
                                                          GFP_KERNEL);
                        else
                                hog->chip_label = kasprintf(GFP_KERNEL,
-                                                       "gpio-sim.%u-%s",
+                                                       "gpio-sim.%u-%pfwP",
                                                        dev->id,
-                                                       fwnode_get_name(
-                                                               bank->swnode));
+                                                       bank->swnode);
                        if (!hog->chip_label) {
                                gpio_sim_remove_hogs(dev);
                                return -ENOMEM;
--
Quoted 2 lines

2.39.1

Applied, thanks!

Bart