leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpiolib: use kstrdup_const() for gpio_device label

Browse Source 
Users often pass a pointer to a static string to gpiochip_add_data()
family of functions. Avoid unnecessary memory allocations with the
provided helper routine.

While at it: use a ternary operator instead of an if else for brevity.

Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Bartosz Golaszewski 2017-12-14 15:29:20 +01:00 committed by Linus Walleij
parent 3b469b0a13
commit fcf273e580
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpio/gpiolib.c
View File

@ -1062,7 +1062,7 @@ static void gpiodevice_release(struct device *dev)
list_del(&gdev->list); list_del(&gdev->list);
ida_simple_remove(&gpio_ida, gdev->id); ida_simple_remove(&gpio_ida, gdev->id);
kfree(gdev->label); kfree_const(gdev->label);
kfree(gdev->descs); kfree(gdev->descs);
kfree(gdev); kfree(gdev);
} }
@ -1170,10 +1170,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
goto err_free_descs; goto err_free_descs;
} }
if (chip->label) gdev->label = kstrdup_const(chip->label ?: "unknown", GFP_KERNEL);
gdev->label = kstrdup(chip->label, GFP_KERNEL);
else
gdev->label = kstrdup("unknown", GFP_KERNEL);
if (!gdev->label) { if (!gdev->label) {
status = -ENOMEM; status = -ENOMEM;
goto err_free_descs; goto err_free_descs;
@ -1294,7 +1291,7 @@ err_remove_from_list:
list_del(&gdev->list); list_del(&gdev->list);
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
err_free_label: err_free_label:
kfree(gdev->label); kfree_const(gdev->label);
err_free_descs: err_free_descs:
kfree(gdev->descs); kfree(gdev->descs);
err_free_gdev: err_free_gdev: