p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gpio: sysfs: split irq allocation and deallocation 

Add separate helper functions for irq request and free.

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:41 +02:00 committed by Linus Walleij
parent b91e18076f
commit 2ec74a9593
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
struct gpiod_data { struct gpiod_data {
struct gpio_desc *desc; struct gpio_desc *desc;
struct kernfs_node *value_kn; struct kernfs_node *value_kn;
int irq;
}; };
/* lock protects against unexport_gpio() being called while /* lock protects against unexport_gpio() being called while
@ -132,27 +133,20 @@ static irqreturn_t gpio_sysfs_irq(int irq, void *priv)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int gpio_setup_irq(struct device *dev, unsigned long gpio_flags) static int gpio_sysfs_request_irq(struct device *dev, unsigned long gpio_flags)
{ {
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;
unsigned long irq_flags; unsigned long irq_flags;
int ret, irq; int ret;
irq = gpiod_to_irq(desc); data->irq = gpiod_to_irq(desc);
if (irq < 0) if (data->irq < 0)
return -EIO; return -EIO;
if (data->value_kn) data->value_kn = sysfs_get_dirent(dev->kobj.sd, "value");
free_irq(irq, data); if (!data->value_kn)
return -ENODEV;
desc->flags &= ~GPIO_TRIGGER_MASK;
if (!gpio_flags) {
gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
ret = 0;
goto free_kn;
}
irq_flags = IRQF_SHARED; irq_flags = IRQF_SHARED;
if (test_bit(FLAG_TRIG_FALL, &gpio_flags)) if (test_bit(FLAG_TRIG_FALL, &gpio_flags))
@ -162,14 +156,6 @@ static int gpio_setup_irq(struct device *dev, unsigned long gpio_flags)
irq_flags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ? irq_flags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?
IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING; IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;
if (!data->value_kn) {
data->value_kn = sysfs_get_dirent(dev->kobj.sd, "value");
if (!data->value_kn) {
ret = -ENODEV;
goto err_out;
}
}
/* /*
* FIXME: This should be done in the irq_request_resources callback * FIXME: This should be done in the irq_request_resources callback
* when the irq is requested, but a few drivers currently fail * when the irq is requested, but a few drivers currently fail
@ -180,27 +166,36 @@ static int gpio_setup_irq(struct device *dev, unsigned long gpio_flags)
*/ */
ret = gpiochip_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc)); ret = gpiochip_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
if (ret < 0) if (ret < 0)
goto free_kn; goto err_put_kn;
ret = request_any_context_irq(irq, gpio_sysfs_irq, irq_flags, ret = request_any_context_irq(data->irq, gpio_sysfs_irq, irq_flags,
"gpiolib", data); "gpiolib", data);
if (ret < 0) if (ret < 0)
goto err_unlock; goto err_unlock;
desc->flags |= gpio_flags; desc->flags |= gpio_flags;
return 0; return 0;
err_unlock: err_unlock:
gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc)); gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
free_kn: err_put_kn:
if (data->value_kn) { sysfs_put(data->value_kn);
sysfs_put(data->value_kn);
data->value_kn = NULL;
}
err_out:
return ret; return ret;
} }
static void gpio_sysfs_free_irq(struct device *dev)
{
struct gpiod_data *data = dev_get_drvdata(dev);
struct gpio_desc *desc = data->desc;
desc->flags &= ~GPIO_TRIGGER_MASK;
free_irq(data->irq, data);
gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));
sysfs_put(data->value_kn);
}
static const struct { static const struct {
const char *name; const char *name;
unsigned long flags; unsigned long flags;
@ -240,7 +235,7 @@ static ssize_t edge_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;
unsigned long flags; unsigned long flags;
ssize_t status; ssize_t status = size;
int i; int i;
for (i = 0; i < ARRAY_SIZE(trigger_types); i++) for (i = 0; i < ARRAY_SIZE(trigger_types); i++)
@ -258,9 +253,14 @@ static ssize_t edge_store(struct device *dev,
goto out_unlock; goto out_unlock;
} }
status = gpio_setup_irq(dev, flags); if (desc->flags & GPIO_TRIGGER_MASK)
if (!status) gpio_sysfs_free_irq(dev);
status = size;
if (flags) {
status = gpio_sysfs_request_irq(dev, flags);
if (!status)
status = size;
}
out_unlock: out_unlock:
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
@ -288,8 +288,8 @@ static int sysfs_set_active_low(struct device *dev, int value)
!!test_bit(FLAG_TRIG_FALL, &desc->flags)) { !!test_bit(FLAG_TRIG_FALL, &desc->flags)) {
unsigned long trigger_flags = desc->flags & GPIO_TRIGGER_MASK; unsigned long trigger_flags = desc->flags & GPIO_TRIGGER_MASK;
gpio_setup_irq(dev, 0); gpio_sysfs_free_irq(dev);
status = gpio_setup_irq(dev, trigger_flags); status = gpio_sysfs_request_irq(dev, trigger_flags);
} }
return status; return status;
@ -699,7 +699,7 @@ void gpiod_unexport(struct gpio_desc *desc)
* edge_store. * edge_store.
*/ */
if (desc->flags & GPIO_TRIGGER_MASK) if (desc->flags & GPIO_TRIGGER_MASK)
gpio_setup_irq(dev, 0); gpio_sysfs_free_irq(dev);
put_device(dev); put_device(dev);
kfree(data); kfree(data);
} }