renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

gpio: sysfs: remove redundant export tests

Browse Source 
The attribute operations will never be called for an unregistered device
so remove redundant checks for FLAG_EXPORT.

Note that kernfs will also guarantee that any active sysfs operation has
finished before the attribute is removed during deregistration.

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:36 +02:00 committed by Linus Walleij
parent 54d9acd754
commit f0b7866a02
1 changed files with 23 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,14 +46,10 @@ static ssize_t direction_show(struct device *dev,
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) { gpiod_get_direction(desc);
status = -EIO; status = sprintf(buf, "%s\n",
} else {
gpiod_get_direction(desc);
status = sprintf(buf, "%s\n",
test_bit(FLAG_IS_OUT, &desc->flags) test_bit(FLAG_IS_OUT, &desc->flags)
? "out" : "in"); ? "out" : "in");
}
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
return status; return status;
@ -67,9 +63,7 @@ static ssize_t direction_store(struct device *dev,
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) if (sysfs_streq(buf, "high"))
status = -EIO;
else if (sysfs_streq(buf, "high"))
status = gpiod_direction_output_raw(desc, 1); status = gpiod_direction_output_raw(desc, 1);
else if (sysfs_streq(buf, "out") || sysfs_streq(buf, "low")) else if (sysfs_streq(buf, "out") || sysfs_streq(buf, "low"))
status = gpiod_direction_output_raw(desc, 0); status = gpiod_direction_output_raw(desc, 0);
@ -91,10 +85,7 @@ static ssize_t value_show(struct device *dev,
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) status = sprintf(buf, "%d\n", gpiod_get_value_cansleep(desc));
status = -EIO;
else
status = sprintf(buf, "%d\n", gpiod_get_value_cansleep(desc));
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
return status; return status;
@ -108,11 +99,9 @@ static ssize_t value_store(struct device *dev,
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) if (!test_bit(FLAG_IS_OUT, &desc->flags)) {
status = -EIO;
else if (!test_bit(FLAG_IS_OUT, &desc->flags))
status = -EPERM; status = -EPERM;
else { } else {
long value; long value;
status = kstrtol(buf, 0, &value); status = kstrtol(buf, 0, &value);
@ -237,23 +226,18 @@ static ssize_t edge_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
const struct gpio_desc *desc = dev_get_drvdata(dev); const struct gpio_desc *desc = dev_get_drvdata(dev);
ssize_t status; unsigned long mask;
ssize_t status = 0;
int i;
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) for (i = 0; i < ARRAY_SIZE(trigger_types); i++) {
status = -EIO; mask = desc->flags & GPIO_TRIGGER_MASK;
else { if (mask == trigger_types[i].flags) {
int i; status = sprintf(buf, "%s\n", trigger_types[i].name);
break;
status = 0; }
for (i = 0; i < ARRAY_SIZE(trigger_types); i++)
if ((desc->flags & GPIO_TRIGGER_MASK)
== trigger_types[i].flags) {
status = sprintf(buf, "%s\n",
trigger_types[i].name);
break;
}
} }
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
@ -275,13 +259,9 @@ static ssize_t edge_store(struct device *dev,
found: found:
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) status = gpio_setup_irq(desc, dev, trigger_types[i].flags);
status = -EIO; if (!status)
else { status = size;
status = gpio_setup_irq(desc, dev, trigger_types[i].flags);
if (!status)
status = size;
}
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
@ -322,10 +302,7 @@ static ssize_t active_low_show(struct device *dev,
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) status = sprintf(buf, "%d\n",
status = -EIO;
else
status = sprintf(buf, "%d\n",
!!test_bit(FLAG_ACTIVE_LOW, &desc->flags)); !!test_bit(FLAG_ACTIVE_LOW, &desc->flags));
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
@ -338,18 +315,13 @@ static ssize_t active_low_store(struct device *dev,
{ {
struct gpio_desc *desc = dev_get_drvdata(dev); struct gpio_desc *desc = dev_get_drvdata(dev);
ssize_t status; ssize_t status;
long value;
mutex_lock(&sysfs_lock); mutex_lock(&sysfs_lock);
if (!test_bit(FLAG_EXPORT, &desc->flags)) { status = kstrtol(buf, 0, &value);
status = -EIO; if (status == 0)
} else { status = sysfs_set_active_low(desc, dev, value != 0);
long value;
status = kstrtol(buf, 0, &value);
if (status == 0)
status = sysfs_set_active_low(desc, dev, value != 0);
}
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);