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

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

Browse Source 
In a few places we perform sysfs_emit() 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:15 +02:00 committed by Bartosz Golaszewski
parent 4398693a9e
commit e28747da77
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,17 +61,16 @@ static ssize_t direction_show(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; int value;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
gpiod_get_direction(desc); gpiod_get_direction(desc);
status = sysfs_emit(buf, "%s\n", value = !!test_bit(FLAG_IS_OUT, &desc->flags);
test_bit(FLAG_IS_OUT, &desc->flags) ? "out" : "in");
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return status; return sysfs_emit(buf, "%s\n", value ? "out" : "in");
} }
static ssize_t direction_store(struct device *dev, static ssize_t direction_store(struct device *dev,
@ -108,12 +107,13 @@ static ssize_t value_show(struct device *dev,
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
status = gpiod_get_value_cansleep(desc); status = gpiod_get_value_cansleep(desc);
if (status >= 0)
status = sysfs_emit(buf, "%zd\n", status);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return status; if (status < 0)
return status;
return sysfs_emit(buf, "%zd\n", status);
} }
static ssize_t value_store(struct device *dev, static ssize_t value_store(struct device *dev,
@ -238,7 +238,6 @@ static ssize_t edge_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct gpiod_data *data = dev_get_drvdata(dev); struct gpiod_data *data = dev_get_drvdata(dev);
ssize_t status = 0;
int i; int i;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
@ -247,12 +246,13 @@ static ssize_t edge_show(struct device *dev,
if (data->irq_flags == trigger_types[i].flags) if (data->irq_flags == trigger_types[i].flags)
break; break;
} }
if (i < ARRAY_SIZE(trigger_types))
status = sysfs_emit(buf, "%s\n", trigger_types[i].name);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return status; if (i >= ARRAY_SIZE(trigger_types))
return 0;
return sysfs_emit(buf, "%s\n", trigger_types[i].name);
} }
static ssize_t edge_store(struct device *dev, static ssize_t edge_store(struct device *dev,
@ -324,16 +324,15 @@ static ssize_t active_low_show(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; int value;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
status = sysfs_emit(buf, "%d\n", value = !!test_bit(FLAG_ACTIVE_LOW, &desc->flags);
!!test_bit(FLAG_ACTIVE_LOW, &desc->flags));
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return status; return sysfs_emit(buf, "%d\n", value);
} }
static ssize_t active_low_store(struct device *dev, static ssize_t active_low_store(struct device *dev,