summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/zylonite-wm97xx.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-05 19:13:12 +0800
committerArnd Bergmann <arnd@arndb.de>2011-12-28 10:14:18 +0000
commitb5d798cc7a221aec50baf496c482280f1b809143 (patch)
tree7f822dc74cb83edaee0b683b9061395022617e6b /drivers/input/touchscreen/zylonite-wm97xx.c
parent34641de2ef118b9c78a842fb75e6d3cc49c1de31 (diff)
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 <broonie@opensource.wolfsonmicro.com> Cc: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/input/touchscreen/zylonite-wm97xx.c')
-rw-r--r--drivers/input/touchscreen/zylonite-wm97xx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
index f6328c0cded6..0a707bbbbea6 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,