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

Commit 56d30ec1 authored by Johan Hovold's avatar Johan Hovold Committed by Linus Walleij
Browse files

gpio: sysfs: clean up gpiod_export_link locking 



Drop unnecessary locking from gpiod_export_link. If the class device has
not already been unregistered, class_find_device returns the ref-counted
class device so there's no need for locking.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e4339ce3

drivers/gpio/gpiolib-sysfs.c

+8 −20
Original line number Diff line number Diff line
@@ -631,34 +631,22 @@ static int match_export(struct device *dev, const void *desc) 
int gpiod_export_link(struct device *dev, const char *name,

		      struct gpio_desc *desc)

{

	int			status = -EINVAL;

	struct device *cdev;

	int ret;



	if (!desc) {

		pr_warn("%s: invalid GPIO\n", __func__);

		return -EINVAL;

	}



	mutex_lock(&sysfs_lock);



	if (test_bit(FLAG_EXPORT, &desc->flags)) {

		struct device *tdev;



		tdev = class_find_device(&gpio_class, NULL, desc, match_export);

		if (tdev != NULL) {

			status = sysfs_create_link(&dev->kobj, &tdev->kobj,

						name);

			put_device(tdev);

		} else {

			status = -ENODEV;

		}

	}



	mutex_unlock(&sysfs_lock);

	cdev = class_find_device(&gpio_class, NULL, desc, match_export);

	if (!cdev)

		return -ENODEV;



	if (status)

		gpiod_dbg(desc, "%s: status %d\n", __func__, status);

	ret = sysfs_create_link(&dev->kobj, &cdev->kobj, name);

	put_device(cdev);



	return status;

	return ret;

}

EXPORT_SYMBOL_GPL(gpiod_export_link);