Skip to content

Commit 6b3c179

Browse files
andy-shevbrgl
authored andcommitted
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
1 parent e28747d commit 6b3c179

1 file changed

Lines changed: 12 additions & 16 deletions

File tree

drivers/gpio/gpiolib-sysfs.c

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,24 +121,18 @@ static ssize_t value_store(struct device *dev,
121121
{
122122
struct gpiod_data *data = dev_get_drvdata(dev);
123123
struct gpio_desc *desc = data->desc;
124-
ssize_t status = 0;
124+
ssize_t status;
125+
long value;
126+
127+
status = kstrtol(buf, 0, &value);
125128

126129
mutex_lock(&data->mutex);
127130

128131
if (!test_bit(FLAG_IS_OUT, &desc->flags)) {
129132
status = -EPERM;
130-
} else {
131-
long value;
132-
133-
if (size <= 2 && isdigit(buf[0]) &&
134-
(size == 1 || buf[1] == '\n'))
135-
value = buf[0] - '0';
136-
else
137-
status = kstrtol(buf, 0, &value);
138-
if (status == 0) {
139-
gpiod_set_value_cansleep(desc, value);
140-
status = size;
141-
}
133+
} else if (status == 0) {
134+
gpiod_set_value_cansleep(desc, value);
135+
status = size;
142136
}
143137

144138
mutex_unlock(&data->mutex);
@@ -342,11 +336,13 @@ static ssize_t active_low_store(struct device *dev,
342336
ssize_t status;
343337
long value;
344338

339+
status = kstrtol(buf, 0, &value);
340+
if (status)
341+
return status;
342+
345343
mutex_lock(&data->mutex);
346344

347-
status = kstrtol(buf, 0, &value);
348-
if (status == 0)
349-
status = gpio_sysfs_set_active_low(dev, value);
345+
status = gpio_sysfs_set_active_low(dev, value);
350346

351347
mutex_unlock(&data->mutex);
352348

0 commit comments

Comments
 (0)