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-imx | |
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-imx')
-rw-r--r-- | arch/arm/mach-imx/irq.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c index e6695c4e623b..e1b1f028b930 100644 --- a/arch/arm/mach-imx/irq.c +++ b/arch/arm/mach-imx/irq.c | |||
@@ -111,7 +111,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type) | |||
111 | reg = irq >> 5; | 111 | reg = irq >> 5; |
112 | bit = 1 << (irq % 32); | 112 | bit = 1 << (irq % 32); |
113 | 113 | ||
114 | if (type == IRQT_PROBE) { | 114 | if (type == IRQ_TYPE_PROBE) { |
115 | /* Don't mess with enabled GPIOs using preconfigured edges or | 115 | /* Don't mess with enabled GPIOs using preconfigured edges or |
116 | GPIOs set to alternate function during probe */ | 116 | GPIOs set to alternate function during probe */ |
117 | /* TODO: support probe */ | 117 | /* TODO: support probe */ |
@@ -120,7 +120,7 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type) | |||
120 | // return 0; | 120 | // return 0; |
121 | // if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2))) | 121 | // if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2))) |
122 | // return 0; | 122 | // return 0; |
123 | // type = __IRQT_RISEDGE | __IRQT_FALEDGE; | 123 | // type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; |
124 | } | 124 | } |
125 | 125 | ||
126 | GIUS(reg) |= bit; | 126 | GIUS(reg) |= bit; |
@@ -128,19 +128,19 @@ imx_gpio_irq_type(unsigned int _irq, unsigned int type) | |||
128 | 128 | ||
129 | DEBUG_IRQ("setting type of irq %d to ", _irq); | 129 | DEBUG_IRQ("setting type of irq %d to ", _irq); |
130 | 130 | ||
131 | if (type & __IRQT_RISEDGE) { | 131 | if (type & IRQ_TYPE_EDGE_RISING) { |
132 | DEBUG_IRQ("rising edges\n"); | 132 | DEBUG_IRQ("rising edges\n"); |
133 | irq_type = 0x0; | 133 | irq_type = 0x0; |
134 | } | 134 | } |
135 | if (type & __IRQT_FALEDGE) { | 135 | if (type & IRQ_TYPE_EDGE_FALLING) { |
136 | DEBUG_IRQ("falling edges\n"); | 136 | DEBUG_IRQ("falling edges\n"); |
137 | irq_type = 0x1; | 137 | irq_type = 0x1; |
138 | } | 138 | } |
139 | if (type & __IRQT_LOWLVL) { | 139 | if (type & IRQ_TYPE_LEVEL_LOW) { |
140 | DEBUG_IRQ("low level\n"); | 140 | DEBUG_IRQ("low level\n"); |
141 | irq_type = 0x3; | 141 | irq_type = 0x3; |
142 | } | 142 | } |
143 | if (type & __IRQT_HIGHLVL) { | 143 | if (type & IRQ_TYPE_LEVEL_HIGH) { |
144 | DEBUG_IRQ("high level\n"); | 144 | DEBUG_IRQ("high level\n"); |
145 | irq_type = 0x2; | 145 | irq_type = 0x2; |
146 | } | 146 | } |