Skip to contentSkip to conversation

gpio: dwapb_gpio: Change to use devm_kcalloc()

PATCH New Ley Foon Tan 2 participants 2 messages Sep 19, 2018 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 gpio: dwapb_gpio: Change to use devm_kcalloc()

Change to use managed resource function devm_kcalloc(), so it will auto free memory when driver is removed.

---
v3:
- Remove goto and return directly.

v2:
- Remove free() function.

---
 drivers/gpio/dwapb_gpio.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/gpio/dwapb_gpio.c +2 -9
index 0f6574d..68836a7 100644
@@ -171,8 +171,7 @@ static int gpio_dwapb_bind(struct udevice *dev)
 		if (!fdtdec_get_bool(blob, node, "gpio-controller"))
 			continue;
 
-		plat = NULL;
-		plat = calloc(1, sizeof(*plat));
+		plat = devm_kcalloc(dev, 1, sizeof(*plat), GFP_KERNEL);
 		if (!plat)
 			return -ENOMEM;
 
@@ -181,23 +180,17 @@ static int gpio_dwapb_bind(struct udevice *dev)
 		plat->pins = fdtdec_get_int(blob, node, "snps,nr-gpios", 0);
 		plat->name = fdt_stringlist_get(blob, node, "bank-name", 0,
 						NULL);
-		if (ret)
-			goto err;
 
 		ret = device_bind(dev, dev->driver, plat->name,
 				  plat, -1, &subdev);
 		if (ret)
-			goto err;
+			return ret;
 
 		dev_set_of_offset(subdev, node);
 		bank++;
 	}
 
 	return 0;
-
-err:
-	free(plat);
-	return ret;
 }
 
 static int gpio_dwapb_remove(struct udevice *dev)
Signature · 1 line
2.2.2
Applied
#1 lore raw

PATCH v3 1/1 gpio: dwapb_gpio: Change to use devm_kcalloc()

Quoted 30 lines · Ley Foon Tan

Change to use managed resource function devm_kcalloc(), so it will auto free memory when driver is removed.

---
v3:
- Remove goto and return directly.

v2:
- Remove free() function.

---
 drivers/gpio/dwapb_gpio.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/gpio/dwapb_gpio.c +1 -2
index 0f6574d..68836a7 100644
@@ -171,8 +171,7 @@ static int gpio_dwapb_bind(struct udevice *dev)
 		if (!fdtdec_get_bool(blob, node, "gpio-controller"))
 			continue;
 
-		plat = NULL;
-		plat = calloc(1, sizeof(*plat));
+		plat = devm_kcalloc(dev, 1, sizeof(*plat), GFP_KERNEL);
 		if (!plat)
 			return -ENOMEM;
 

drivers/gpio/dwapb_gpio.c static int gpio_dwapb_bind(struct udevice *dev) · line 185

Quoted 8 lines
drivers/gpio/dwapb_gpio.c +0 -2
@@ -181,23 +180,17 @@ static int gpio_dwapb_bind(struct udevice *dev)
 		plat->pins = fdtdec_get_int(blob, node, "snps,nr-gpios", 0);
 		plat->name = fdt_stringlist_get(blob, node, "bank-name", 0,
 						NULL);
-		if (ret)
-			goto err;
 
 		ret = device_bind(dev, dev->driver, plat->name,
 				  plat, -1, &subdev);

btw. on DW GPIO with multiple banks, if this bind fails for any bank but the first, the driver won't clean up properly ;-)

Quoted 7 lines
drivers/gpio/dwapb_gpio.c +1 -1
 		if (ret)
-			goto err;
+			return ret;
 
 		dev_set_of_offset(subdev, node);
 		bank++;

drivers/gpio/dwapb_gpio.c static int gpio_dwapb_bind(struct udevice *dev) · line 196

Quoted 10 lines
drivers/gpio/dwapb_gpio.c +0 -4
 	}
 
 	return 0;
-
-err:
-	free(plat);
-	return ret;
 }
 
 static int gpio_dwapb_remove(struct udevice *dev)

Applied, thanks

Signature · 2 lines
Best regards,
Marek Vasut