qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio: sysfs: reduce gpiochip-export locking scope 

Reduce scope of sysfs_lock protection during chip export and unexport,
which is only needed to prevent gpiod (re-)exports during chip removal.

Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Johan Hovold 2015-05-04 17:10:30 +02:00 committed by Linus Walleij
parent cecf58ab55
commit 3ff74be5c1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpio/gpiolib-sysfs.c
View File

@ -779,7 +779,6 @@ int gpiochip_export(struct gpio_chip *chip)
return 0; return 0;
/* use chip->base for the ID; it's already known to be unique */ /* use chip->base for the ID; it's already known to be unique */
mutex_lock(&sysfs_lock);
dev = device_create_with_groups(&gpio_class, chip->dev, MKDEV(0, 0), dev = device_create_with_groups(&gpio_class, chip->dev, MKDEV(0, 0),
chip, gpiochip_groups, chip, gpiochip_groups,
"gpiochip%d", chip->base); "gpiochip%d", chip->base);
@ -787,6 +786,8 @@ int gpiochip_export(struct gpio_chip *chip)
status = PTR_ERR(dev); status = PTR_ERR(dev);
else else
status = 0; status = 0;
mutex_lock(&sysfs_lock);
chip->exported = (status == 0); chip->exported = (status == 0);
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
@ -803,17 +804,17 @@ void gpiochip_unexport(struct gpio_chip *chip)
struct gpio_desc *desc; struct gpio_desc *desc;
unsigned int i; unsigned int i;
mutex_lock(&sysfs_lock);
dev = class_find_device(&gpio_class, NULL, chip, match_export); dev = class_find_device(&gpio_class, NULL, chip, match_export);
if (dev) { if (dev) {
put_device(dev); put_device(dev);
device_unregister(dev); device_unregister(dev);
/* prevent further gpiod exports */ /* prevent further gpiod exports */
mutex_lock(&sysfs_lock);
chip->exported = false; chip->exported = false;
mutex_unlock(&sysfs_lock);
status = 0; status = 0;
} else } else
status = -ENODEV; status = -ENODEV;
mutex_unlock(&sysfs_lock);
if (status) if (status)
chip_dbg(chip, "%s: status %d\n", __func__, status); chip_dbg(chip, "%s: status %d\n", __func__, status);