summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/gpio.c
diff options
context:
space:
mode:
authorJohan Hovold <johan@hovoldconsulting.com>2015-05-26 15:29:23 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2015-05-26 15:26:08 -0700
commit0cb918d72d8f76b1189a63cefedbc5cb4dad9d54 (patch)
tree07b59aad640b531d0ab32282b3e1be6a9b7327ad /drivers/staging/greybus/gpio.c
parentec762115a5006db8549b3582f7f19849f7cf4ab4 (diff)
greybus: gpio: rename irq mask and unmask callbacks
Rename irq mask and unmask functions to match the callback names. Signed-off-by: Johan Hovold <johan@hovoldconsulting.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/gpio.c')
-rw-r--r--drivers/staging/greybus/gpio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 15cc0ea4e3a5..0220a9f1ff9c 100644
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -211,7 +211,7 @@ static int gb_gpio_set_debounce_operation(struct gb_gpio_controller *ggc,
return ret;
}
-static void gb_gpio_mask_irq(struct irq_data *d)
+static void gb_gpio_irq_mask(struct irq_data *d)
{
struct gpio_chip *chip = irq_data_to_gpio_chip(d);
struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
@@ -226,7 +226,7 @@ static void gb_gpio_mask_irq(struct irq_data *d)
dev_err(chip->dev, "failed to mask irq: %d\n", ret);
}
-static void gb_gpio_unmask_irq(struct irq_data *d)
+static void gb_gpio_irq_unmask(struct irq_data *d)
{
struct gpio_chip *chip = irq_data_to_gpio_chip(d);
struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
@@ -575,8 +575,8 @@ static int gb_gpio_connection_init(struct gb_connection *connection)
goto err_free_controller;
irqc = &ggc->irqc;
- irqc->irq_mask = gb_gpio_mask_irq;
- irqc->irq_unmask = gb_gpio_unmask_irq;
+ irqc->irq_mask = gb_gpio_irq_mask;
+ irqc->irq_unmask = gb_gpio_irq_unmask;
irqc->irq_set_type = gb_gpio_irq_set_type;
irqc->name = "greybus_gpio";