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 /arch/arm/mach-at91 | |
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 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/board-cap9adk.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/irq.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c index 8a2a958639db..b4b67eb1cbcb 100644 --- a/arch/arm/mach-at91/board-cap9adk.c +++ b/arch/arm/mach-at91/board-cap9adk.c | |||
@@ -330,10 +330,10 @@ static void __init cap9adk_board_init(void) | |||
330 | /* Serial */ | 330 | /* Serial */ |
331 | at91_add_device_serial(); | 331 | at91_add_device_serial(); |
332 | /* USB Host */ | 332 | /* USB Host */ |
333 | set_irq_type(AT91CAP9_ID_UHP, IRQT_HIGH); | 333 | set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH); |
334 | at91_add_device_usbh(&cap9adk_usbh_data); | 334 | at91_add_device_usbh(&cap9adk_usbh_data); |
335 | /* USB HS */ | 335 | /* USB HS */ |
336 | set_irq_type(AT91CAP9_ID_UDPHS, IRQT_HIGH); | 336 | set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH); |
337 | at91_add_device_usba(&cap9adk_usba_udc_data); | 337 | at91_add_device_usba(&cap9adk_usba_udc_data); |
338 | /* SPI */ | 338 | /* SPI */ |
339 | at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices)); | 339 | at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices)); |
@@ -350,7 +350,7 @@ static void __init cap9adk_board_init(void) | |||
350 | /* I2C */ | 350 | /* I2C */ |
351 | at91_add_device_i2c(NULL, 0); | 351 | at91_add_device_i2c(NULL, 0); |
352 | /* LCD Controller */ | 352 | /* LCD Controller */ |
353 | set_irq_type(AT91CAP9_ID_LCDC, IRQT_HIGH); | 353 | set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH); |
354 | at91_add_device_lcdc(&cap9adk_lcdc_data); | 354 | at91_add_device_lcdc(&cap9adk_lcdc_data); |
355 | /* AC97 */ | 355 | /* AC97 */ |
356 | at91_add_device_ac97(&cap9adk_ac97_data); | 356 | at91_add_device_ac97(&cap9adk_ac97_data); |
diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c index 78a5cdb746dc..ca87587b2b4b 100644 --- a/arch/arm/mach-at91/irq.c +++ b/arch/arm/mach-at91/irq.c | |||
@@ -56,19 +56,19 @@ static int at91_aic_set_type(unsigned irq, unsigned type) | |||
56 | unsigned int smr, srctype; | 56 | unsigned int smr, srctype; |
57 | 57 | ||
58 | switch (type) { | 58 | switch (type) { |
59 | case IRQT_HIGH: | 59 | case IRQ_TYPE_LEVEL_HIGH: |
60 | srctype = AT91_AIC_SRCTYPE_HIGH; | 60 | srctype = AT91_AIC_SRCTYPE_HIGH; |
61 | break; | 61 | break; |
62 | case IRQT_RISING: | 62 | case IRQ_TYPE_EDGE_RISING: |
63 | srctype = AT91_AIC_SRCTYPE_RISING; | 63 | srctype = AT91_AIC_SRCTYPE_RISING; |
64 | break; | 64 | break; |
65 | case IRQT_LOW: | 65 | case IRQ_TYPE_LEVEL_LOW: |
66 | if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ | 66 | if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ |
67 | srctype = AT91_AIC_SRCTYPE_LOW; | 67 | srctype = AT91_AIC_SRCTYPE_LOW; |
68 | else | 68 | else |
69 | return -EINVAL; | 69 | return -EINVAL; |
70 | break; | 70 | break; |
71 | case IRQT_FALLING: | 71 | case IRQ_TYPE_EDGE_FALLING: |
72 | if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ | 72 | if ((irq == AT91_ID_FIQ) || is_extern_irq(irq)) /* only supported on external interrupts */ |
73 | srctype = AT91_AIC_SRCTYPE_FALLING; | 73 | srctype = AT91_AIC_SRCTYPE_FALLING; |
74 | else | 74 | else |