linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@ingics.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>,
	Jean-Jacques Hiblot <jjhiblot@traphandler.com>,
	Jamie Iles <jamie@jamieiles.com>,
	linux-gpio@vger.kernel.org
Subject: [PATCH] gpio: Return int for .irq_request_resources callback
Date: Tue, 18 Mar 2014 17:40:20 +0800	[thread overview]
Message-ID: <1395135620.18373.2.camel@phoenix> (raw)

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@ingics.com>
---
 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




             reply	other threads:[~2014-03-18  9:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-18  9:40 Axel Lin [this message]
2014-03-24  8:56 ` [PATCH] gpio: Return int for .irq_request_resources callback Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1395135620.18373.2.camel@phoenix \
    --to=axel.lin@ingics.com \
    --cc=gnurou@gmail.com \
    --cc=jamie@jamieiles.com \
    --cc=jjhiblot@traphandler.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-gpio@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).