linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
@ 2011-12-05 11:13 Axel Lin
  2011-12-05 11:30 ` Haojian Zhuang
  2011-12-05 11:50 ` Mark Brown
  0 siblings, 2 replies; 5+ messages in thread
From: Axel Lin @ 2011-12-05 11:13 UTC (permalink / raw)
  To: linux-kernel
  Cc: Mark Brown, Haojian Zhuang, Liam Girdwood, Dmitry Torokhov,
	linux-input

Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ",
I got below buid errors due to implicit declaration of function 'IRQ_GPIO'.

Use common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().

  CC      drivers/input/touchscreen/zylonite-wm97xx.o
drivers/input/touchscreen/zylonite-wm97xx.c: In function 'zylonite_wm97xx_probe':
drivers/input/touchscreen/zylonite-wm97xx.c:195: error: implicit declaration of function 'IRQ_GPIO'
make[3]: *** [drivers/input/touchscreen/zylonite-wm97xx.o] Error 1
make[2]: *** [drivers/input/touchscreen] Error 2
make[1]: *** [drivers/input] Error 2
make: *** [drivers] Error 2

Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
I got the build error in linux-next tree,
thus this patch is against linux-next (20111205).

Axel
 drivers/input/touchscreen/zylonite-wm97xx.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
index add6e3b..bf0869a7 100644
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -192,8 +193,8 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev)
 	else
 		gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);
 
-	wm->pen_irq = IRQ_GPIO(gpio_touch_irq);
-	irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
+	wm->pen_irq = gpio_to_irq(gpio_touch_irq);
+	irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
 
 	wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,
 			   WM97XX_GPIO_POL_HIGH,
-- 
1.7.5.4




^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  2011-12-05 11:13 [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq() Axel Lin
@ 2011-12-05 11:30 ` Haojian Zhuang
  2011-12-05 11:50 ` Mark Brown
  1 sibling, 0 replies; 5+ messages in thread
From: Haojian Zhuang @ 2011-12-05 11:30 UTC (permalink / raw)
  To: Axel Lin
  Cc: linux-kernel, Mark Brown, Haojian Zhuang, Liam Girdwood,
	Dmitry Torokhov, linux-input

On Mon, Dec 5, 2011 at 7:13 PM, Axel Lin <axel.lin@gmail.com> wrote:
> Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ",
> I got below buid errors due to implicit declaration of function 'IRQ_GPIO'.
>
> Use common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().
>
>  CC      drivers/input/touchscreen/zylonite-wm97xx.o
> drivers/input/touchscreen/zylonite-wm97xx.c: In function 'zylonite_wm97xx_probe':
> drivers/input/touchscreen/zylonite-wm97xx.c:195: error: implicit declaration of function 'IRQ_GPIO'
> make[3]: *** [drivers/input/touchscreen/zylonite-wm97xx.o] Error 1
> make[2]: *** [drivers/input/touchscreen] Error 2
> make[1]: *** [drivers/input] Error 2
> make: *** [drivers] Error 2
>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> I got the build error in linux-next tree,
> thus this patch is against linux-next (20111205).
>
> Axel
>  drivers/input/touchscreen/zylonite-wm97xx.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
> index add6e3b..bf0869a7 100644
> --- a/drivers/input/touchscreen/zylonite-wm97xx.c
> +++ b/drivers/input/touchscreen/zylonite-wm97xx.c
> @@ -22,6 +22,7 @@
>  #include <linux/kernel.h>
>  #include <linux/init.h>
>  #include <linux/delay.h>
> +#include <linux/gpio.h>
>  #include <linux/irq.h>
>  #include <linux/interrupt.h>
>  #include <linux/io.h>
> @@ -192,8 +193,8 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev)
>        else
>                gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);
>
> -       wm->pen_irq = IRQ_GPIO(gpio_touch_irq);
> -       irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
> +       wm->pen_irq = gpio_to_irq(gpio_touch_irq);
> +       irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
>
>        wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,
>                           WM97XX_GPIO_POL_HIGH,
> --

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  2011-12-05 11:13 [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq() Axel Lin
  2011-12-05 11:30 ` Haojian Zhuang
@ 2011-12-05 11:50 ` Mark Brown
  2011-12-06  4:58   ` Haojian Zhuang
  1 sibling, 1 reply; 5+ messages in thread
From: Mark Brown @ 2011-12-05 11:50 UTC (permalink / raw)
  To: Axel Lin
  Cc: linux-kernel, Haojian Zhuang, Liam Girdwood, Dmitry Torokhov,
	linux-input

On Mon, Dec 05, 2011 at 07:13:12PM +0800, Axel Lin wrote:
> Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ",
> I got below buid errors due to implicit declaration of function 'IRQ_GPIO'.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

I guess that for bisection this should go via Eric's tree as it
introduced the issue.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  2011-12-05 11:50 ` Mark Brown
@ 2011-12-06  4:58   ` Haojian Zhuang
  2011-12-06  5:29     ` Dmitry Torokhov
  0 siblings, 1 reply; 5+ messages in thread
From: Haojian Zhuang @ 2011-12-06  4:58 UTC (permalink / raw)
  To: Mark Brown
  Cc: Axel Lin, linux-kernel, Haojian Zhuang, Liam Girdwood,
	Dmitry Torokhov, linux-input

On Mon, Dec 5, 2011 at 7:50 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Mon, Dec 05, 2011 at 07:13:12PM +0800, Axel Lin wrote:
>> Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ",
>> I got below buid errors due to implicit declaration of function 'IRQ_GPIO'.
>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
> I guess that for bisection this should go via Eric's tree as it
> introduced the issue.
> --
Sure. We'll handle it.

Best Regards
Haojian

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
  2011-12-06  4:58   ` Haojian Zhuang
@ 2011-12-06  5:29     ` Dmitry Torokhov
  0 siblings, 0 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2011-12-06  5:29 UTC (permalink / raw)
  To: Haojian Zhuang
  Cc: Mark Brown, Axel Lin, linux-kernel, Haojian Zhuang, Liam Girdwood,
	linux-input

On Tue, Dec 06, 2011 at 12:58:36PM +0800, Haojian Zhuang wrote:
> On Mon, Dec 5, 2011 at 7:50 PM, Mark Brown
> <broonie@opensource.wolfsonmicro.com> wrote:
> > On Mon, Dec 05, 2011 at 07:13:12PM +0800, Axel Lin wrote:
> >> Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ",
> >> I got below buid errors due to implicit declaration of function 'IRQ_GPIO'.
> >
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> >
> > I guess that for bisection this should go via Eric's tree as it
> > introduced the issue.
> > --
> Sure. We'll handle it.
> 

Thanks!

-- 
Dmitry

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-12-06  5:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-05 11:13 [PATCH] Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq() Axel Lin
2011-12-05 11:30 ` Haojian Zhuang
2011-12-05 11:50 ` Mark Brown
2011-12-06  4:58   ` Haojian Zhuang
2011-12-06  5:29     ` Dmitry Torokhov

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).