diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2014-10-23 04:27:07 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-10-28 12:30:59 -0400 |
commit | e3a2e87893125bcd99bd7e1ddf9bfc421e492572 (patch) | |
tree | 725e03df58827c8eca35ffb787f43921c55046b2 /drivers/gpio/gpiolib-sysfs.c | |
parent | ee2a9f7f06a5bff86cf3468fe74bf504640cf5e6 (diff) |
gpio: rename gpio_lock_as_irq to gpiochip_lock_as_irq
This function actually operates on a gpio_chip, so its prefix should
reflect that fact for consistency with other functions defined in
gpio/driver.h.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpiolib-sysfs.c')
-rw-r--r-- | drivers/gpio/gpiolib-sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index 5f2150b619a7..781fbed00fc3 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c | |||
@@ -161,7 +161,7 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, | |||
161 | desc->flags &= ~GPIO_TRIGGER_MASK; | 161 | desc->flags &= ~GPIO_TRIGGER_MASK; |
162 | 162 | ||
163 | if (!gpio_flags) { | 163 | if (!gpio_flags) { |
164 | gpio_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc)); | 164 | gpiochip_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc)); |
165 | ret = 0; | 165 | ret = 0; |
166 | goto free_id; | 166 | goto free_id; |
167 | } | 167 | } |
@@ -200,7 +200,7 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, | |||
200 | if (ret < 0) | 200 | if (ret < 0) |
201 | goto free_id; | 201 | goto free_id; |
202 | 202 | ||
203 | ret = gpio_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc)); | 203 | ret = gpiochip_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc)); |
204 | if (ret < 0) { | 204 | if (ret < 0) { |
205 | gpiod_warn(desc, "failed to flag the GPIO for IRQ\n"); | 205 | gpiod_warn(desc, "failed to flag the GPIO for IRQ\n"); |
206 | goto free_id; | 206 | goto free_id; |