[PATCH] gpio: Return int for .irq_request_resources callback

[Axel Lin <axel.lin@xxxxxxxxxx>]

This fixes below build warnings:

  CC      drivers/gpio/gpio-dwapb.o
drivers/gpio/gpio-dwapb.c: In function 'dwapb_configure_irqs':
drivers/gpio/gpio-dwapb.c:258:33: warning: assignment from incompatible pointer type [enabled by default]
  CC      drivers/gpio/gpio-pl061.o
drivers/gpio/gpio-pl061.c:261:2: warning: initialization from incompatible pointer type [enabled by default]
drivers/gpio/gpio-pl061.c:261:2: warning: (near initialization for 'pl061_irqchip.irq_request_resources') [enabled by default]

Fixes: 9a63a88cd390 ("gpio: switch drivers to use new callback")
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
---
 drivers/gpio/gpio-dwapb.c | 2 +-
 drivers/gpio/gpio-pl061.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 2cacb9ed..ed5711f 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -136,7 +136,7 @@ static void dwapb_irq_disable(struct irq_data *d)
 	spin_unlock_irqrestore(&bgc->lock, flags);
 }
 
-static unsigned int dwapb_irq_reqres(struct irq_data *d)
+static int dwapb_irq_reqres(struct irq_data *d)
 {
 	struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
 	struct dwapb_gpio *gpio = igc->private;
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 2189183..d2a0ad5 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -233,7 +233,7 @@ static void pl061_irq_unmask(struct irq_data *d)
 	spin_unlock(&chip->lock);
 }
 
-static unsigned int pl061_irq_reqres(struct irq_data *d)
+static int pl061_irq_reqres(struct irq_data *d)
 {
 	struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);
 
-- 
1.8.3.2



--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html