Commit 6b3c1791 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski

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

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent e28747da
...@@ -121,24 +121,18 @@ static ssize_t value_store(struct device *dev, ...@@ -121,24 +121,18 @@ 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; gpiod_set_value_cansleep(desc, value);
status = size;
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);
status = size;
}
} }
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
...@@ -342,11 +336,13 @@ static ssize_t active_low_store(struct device *dev, ...@@ -342,11 +336,13 @@ 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); status = gpio_sysfs_set_active_low(dev, value);
if (status == 0)
status = gpio_sysfs_set_active_low(dev, value);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment