Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()

PATCH In review Axel Lin 4 participants 5 messages Dec 5, 2011 – Dec 6, 2011

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Axel Lin

author

2011-12-05 11:13 UTC #0 lore raw

PATCH 1/1 Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()

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 <[email protected]>

Cc Haojian Zhuang <[email protected]>

Signed-off-by Axel Lin <[email protected]>

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

drivers/input/touchscreen/zylonite-wm97xx.c +3 -2

index add6e3b..bf0869a7 100644
@@ -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,

Signature · 1 line

1.7.5.4

Haojian Zhuang

Acked-by on v1 1/1

2011-12-05 11:30 UTC #1 lore raw

Quoted 40 lines · Axel Lin

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 <[email protected]>
Cc Haojian Zhuang <[email protected]>
Signed-off-by Axel Lin <[email protected]>
---
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(-)
drivers/input/touchscreen/zylonite-wm97xx.c +1 -0
index add6e3b..bf0869a7 100644
@@ -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);

Quoted 8 lines

- 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 <[email protected]>

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Mark Brown

Acked-by on v1 1/1

2011-12-05 11:50 UTC #2 lore raw

In reply to Axel Lin

Quoted 2 lines · Axel Lin

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 <[email protected]>

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

Haojian Zhuang

2011-12-06 04:58 UTC #3 lore raw

Quoted 9 lines · Mark Brown

Quoted 2 lines · Axel Lin
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 <[email protected]>
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

Dmitry Torokhov

maintainer

2011-12-06 05:29 UTC #4 lore raw

Quoted 6 lines · Haojian Zhuang

Quoted 4 lines · Mark Brown
Quoted 2 lines · Axel Lin
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'.

Quoted 7 lines

Quoted 5 lines
Acked-by Mark Brown <[email protected]>
I guess that for bisection this should go via Eric's tree as it introduced the issue.
--
Sure. We'll handle it.

Thanks!

Signature · 1 line

Dmitry