Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcf273e5 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Linus Walleij
Browse files

gpiolib: use kstrdup_const() for gpio_device label 



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: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3b469b0a

drivers/gpio/gpiolib.c

+3 −6
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ static void gpiodevice_release(struct device *dev) 


	list_del(&gdev->list);

	ida_simple_remove(&gpio_ida, gdev->id);

	kfree(gdev->label);

	kfree_const(gdev->label);

	kfree(gdev->descs);

	kfree(gdev);

}
@@ -1170,10 +1170,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data, 
		goto err_free_descs;

	}



	if (chip->label)

		gdev->label = kstrdup(chip->label, GFP_KERNEL);

	else

		gdev->label = kstrdup("unknown", GFP_KERNEL);

	gdev->label = kstrdup_const(chip->label ?: "unknown", GFP_KERNEL);

	if (!gdev->label) {

		status = -ENOMEM;

		goto err_free_descs;
@@ -1294,7 +1291,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data, 
	list_del(&gdev->list);

	spin_unlock_irqrestore(&gpio_lock, flags);

err_free_label:

	kfree(gdev->label);

	kfree_const(gdev->label);

err_free_descs:

	kfree(gdev->descs);

err_free_gdev: