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

gpiolib: sysfs: Move kstrtox() calls outside of the mutex lock

Browse Source 
In a few places we perform kstrtox() operations under mutex that
do not require any locking. Move them outside of the mutex locks.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
This commit is contained in:
Andy Shevchenko 2022-02-09 13:31:16 +02:00 committed by Bartosz Golaszewski
parent e28747da77
commit 6b3c1791ae
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,25 +121,19 @@ static ssize_t value_store(struct device *dev,
{ {
struct gpiod_data *data = dev_get_drvdata(dev); struct gpiod_data *data = dev_get_drvdata(dev);
struct gpio_desc *desc = data->desc; struct gpio_desc *desc = data->desc;
ssize_t status = 0; ssize_t status;
long value;
status = kstrtol(buf, 0, &value);
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
if (!test_bit(FLAG_IS_OUT, &desc->flags)) { if (!test_bit(FLAG_IS_OUT, &desc->flags)) {
status = -EPERM; status = -EPERM;
} else { } else if (status == 0) {
long value;
if (size <= 2 && isdigit(buf[0]) &&
(size == 1 || buf[1] == '\n'))
value = buf[0] - '0';
else
status = kstrtol(buf, 0, &value);
if (status == 0) {
gpiod_set_value_cansleep(desc, value); gpiod_set_value_cansleep(desc, value);
status = size; status = size;
} }
}
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
@ -342,10 +336,12 @@ static ssize_t active_low_store(struct device *dev,
ssize_t status; ssize_t status;
long value; long value;
status = kstrtol(buf, 0, &value);
if (status)
return status;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
status = kstrtol(buf, 0, &value);
if (status == 0)
status = gpio_sysfs_set_active_low(dev, value); status = gpio_sysfs_set_active_low(dev, value);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);