diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-07-26 23:23:31 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-27 04:46:18 -0400 |
commit | 6cab48602996cdbcb277375a8107d53e21e8c9b9 (patch) | |
tree | 5a1c8aaf3eed2d5a53170ab69daa94088947d43d /drivers/input/touchscreen | |
parent | d9ecdb282c91952796b7542c4f57fd6de6948d7b (diff) |
[ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
IRQT_* and __IRQT_* were obsoleted long ago by patch [3692/1].
Remove them completely. Sed script for the reference:
s/__IRQT_RISEDGE/IRQ_TYPE_EDGE_RISING/g
s/__IRQT_FALEDGE/IRQ_TYPE_EDGE_FALLING/g
s/__IRQT_LOWLVL/IRQ_TYPE_LEVEL_LOW/g
s/__IRQT_HIGHLVL/IRQ_TYPE_LEVEL_HIGH/g
s/IRQT_RISING/IRQ_TYPE_EDGE_RISING/g
s/IRQT_FALLING/IRQ_TYPE_EDGE_FALLING/g
s/IRQT_BOTHEDGE/IRQ_TYPE_EDGE_BOTH/g
s/IRQT_LOW/IRQ_TYPE_LEVEL_LOW/g
s/IRQT_HIGH/IRQ_TYPE_LEVEL_HIGH/g
s/IRQT_PROBE/IRQ_TYPE_PROBE/g
s/IRQT_NOEDGE/IRQ_TYPE_NONE/g
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/corgi_ts.c | 8 | ||||
-rw-r--r-- | drivers/input/touchscreen/mainstone-wm97xx.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c index 4e9d8eece2e0..d0e13fc4a88c 100644 --- a/drivers/input/touchscreen/corgi_ts.c +++ b/drivers/input/touchscreen/corgi_ts.c | |||
@@ -195,7 +195,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer) | |||
195 | { | 195 | { |
196 | if ((GPLR(IRQ_TO_GPIO(corgi_ts->irq_gpio)) & GPIO_bit(IRQ_TO_GPIO(corgi_ts->irq_gpio))) == 0) { | 196 | if ((GPLR(IRQ_TO_GPIO(corgi_ts->irq_gpio)) & GPIO_bit(IRQ_TO_GPIO(corgi_ts->irq_gpio))) == 0) { |
197 | /* Disable Interrupt */ | 197 | /* Disable Interrupt */ |
198 | set_irq_type(corgi_ts->irq_gpio, IRQT_NOEDGE); | 198 | set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_NONE); |
199 | if (read_xydata(corgi_ts)) { | 199 | if (read_xydata(corgi_ts)) { |
200 | corgi_ts->pendown = 1; | 200 | corgi_ts->pendown = 1; |
201 | new_data(corgi_ts); | 201 | new_data(corgi_ts); |
@@ -214,7 +214,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer) | |||
214 | } | 214 | } |
215 | 215 | ||
216 | /* Enable Falling Edge */ | 216 | /* Enable Falling Edge */ |
217 | set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING); | 217 | set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING); |
218 | corgi_ts->pendown = 0; | 218 | corgi_ts->pendown = 0; |
219 | } | 219 | } |
220 | } | 220 | } |
@@ -258,7 +258,7 @@ static int corgits_resume(struct platform_device *dev) | |||
258 | 258 | ||
259 | corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS); | 259 | corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS); |
260 | /* Enable Falling Edge */ | 260 | /* Enable Falling Edge */ |
261 | set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING); | 261 | set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING); |
262 | corgi_ts->power_mode = PWR_MODE_ACTIVE; | 262 | corgi_ts->power_mode = PWR_MODE_ACTIVE; |
263 | 263 | ||
264 | return 0; | 264 | return 0; |
@@ -333,7 +333,7 @@ static int __init corgits_probe(struct platform_device *pdev) | |||
333 | corgi_ts->power_mode = PWR_MODE_ACTIVE; | 333 | corgi_ts->power_mode = PWR_MODE_ACTIVE; |
334 | 334 | ||
335 | /* Enable Falling Edge */ | 335 | /* Enable Falling Edge */ |
336 | set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING); | 336 | set_irq_type(corgi_ts->irq_gpio, IRQ_TYPE_EDGE_FALLING); |
337 | 337 | ||
338 | return 0; | 338 | return 0; |
339 | 339 | ||
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c index a79f029b91c0..590a1379aa32 100644 --- a/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/drivers/input/touchscreen/mainstone-wm97xx.c | |||
@@ -198,7 +198,7 @@ static int wm97xx_acc_startup(struct wm97xx *wm) | |||
198 | switch (wm->id) { | 198 | switch (wm->id) { |
199 | case WM9705_ID2: | 199 | case WM9705_ID2: |
200 | wm->pen_irq = IRQ_GPIO(4); | 200 | wm->pen_irq = IRQ_GPIO(4); |
201 | set_irq_type(IRQ_GPIO(4), IRQT_BOTHEDGE); | 201 | set_irq_type(IRQ_GPIO(4), IRQ_TYPE_EDGE_BOTH); |
202 | break; | 202 | break; |
203 | case WM9712_ID2: | 203 | case WM9712_ID2: |
204 | case WM9713_ID2: | 204 | case WM9713_ID2: |