diff options
| author | Johan Hovold <johan@kernel.org> | 2015-05-04 17:10:40 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 10:47:23 +0200 |
| commit | b91e18076f0d3ff9b49322a5b8eee595a1e4c082 (patch) | |
| tree | 7157afd79213f55aa2ed3d0a5fa63cf1f9014169 /drivers/gpio | |
| parent | a08f5c21f4a069cd75eb8a6170e3fe8b96e964d6 (diff) | |
gpio: sysfs: only call irq helper if needed
Only call irq helper if actually reconfiguring interrupt state.
This is a preparatory step in introducing separate gpio-irq request and
free functions.
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib-sysfs.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index bccba406fc22..201b757ad0db 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -139,9 +139,6 @@ static int gpio_setup_irq(struct device *dev, unsigned long gpio_flags) unsigned long irq_flags; int ret, irq; - if ((desc->flags & GPIO_TRIGGER_MASK) == gpio_flags) - return 0; - irq = gpiod_to_irq(desc); if (irq < 0) return -EIO; @@ -240,6 +237,9 @@ static ssize_t edge_show(struct device *dev, static ssize_t edge_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t size) { + struct gpiod_data *data = dev_get_drvdata(dev); + struct gpio_desc *desc = data->desc; + unsigned long flags; ssize_t status; int i; @@ -249,12 +249,20 @@ static ssize_t edge_store(struct device *dev, return -EINVAL; found: + flags = trigger_types[i].flags; + mutex_lock(&sysfs_lock); - status = gpio_setup_irq(dev, trigger_types[i].flags); + if ((desc->flags & GPIO_TRIGGER_MASK) == flags) { + status = size; + goto out_unlock; + } + + status = gpio_setup_irq(dev, flags); if (!status) status = size; +out_unlock: mutex_unlock(&sysfs_lock); return status; @@ -690,7 +698,8 @@ void gpiod_unexport(struct gpio_desc *desc) * Release irq after deregistration to prevent race with * edge_store. */ - gpio_setup_irq(dev, 0); + if (desc->flags & GPIO_TRIGGER_MASK) + gpio_setup_irq(dev, 0); put_device(dev); kfree(data); } |