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-ep93xx | |
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-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 1d7bca6aa441..5fed57608507 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
@@ -226,7 +226,7 @@ static void ep93xx_gpio_irq_ack(unsigned int irq) | |||
226 | int port = line >> 3; | 226 | int port = line >> 3; |
227 | int port_mask = 1 << (line & 7); | 227 | int port_mask = 1 << (line & 7); |
228 | 228 | ||
229 | if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) { | 229 | if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) { |
230 | gpio_int_type2[port] ^= port_mask; /* switch edge direction */ | 230 | gpio_int_type2[port] ^= port_mask; /* switch edge direction */ |
231 | ep93xx_gpio_update_int_params(port); | 231 | ep93xx_gpio_update_int_params(port); |
232 | } | 232 | } |
@@ -240,7 +240,7 @@ static void ep93xx_gpio_irq_mask_ack(unsigned int irq) | |||
240 | int port = line >> 3; | 240 | int port = line >> 3; |
241 | int port_mask = 1 << (line & 7); | 241 | int port_mask = 1 << (line & 7); |
242 | 242 | ||
243 | if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) | 243 | if ((irq_desc[irq].status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) |
244 | gpio_int_type2[port] ^= port_mask; /* switch edge direction */ | 244 | gpio_int_type2[port] ^= port_mask; /* switch edge direction */ |
245 | 245 | ||
246 | gpio_int_unmasked[port] &= ~port_mask; | 246 | gpio_int_unmasked[port] &= ~port_mask; |
@@ -283,27 +283,27 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type) | |||
283 | gpio_direction_input(gpio); | 283 | gpio_direction_input(gpio); |
284 | 284 | ||
285 | switch (type) { | 285 | switch (type) { |
286 | case IRQT_RISING: | 286 | case IRQ_TYPE_EDGE_RISING: |
287 | gpio_int_type1[port] |= port_mask; | 287 | gpio_int_type1[port] |= port_mask; |
288 | gpio_int_type2[port] |= port_mask; | 288 | gpio_int_type2[port] |= port_mask; |
289 | desc->handle_irq = handle_edge_irq; | 289 | desc->handle_irq = handle_edge_irq; |
290 | break; | 290 | break; |
291 | case IRQT_FALLING: | 291 | case IRQ_TYPE_EDGE_FALLING: |
292 | gpio_int_type1[port] |= port_mask; | 292 | gpio_int_type1[port] |= port_mask; |
293 | gpio_int_type2[port] &= ~port_mask; | 293 | gpio_int_type2[port] &= ~port_mask; |
294 | desc->handle_irq = handle_edge_irq; | 294 | desc->handle_irq = handle_edge_irq; |
295 | break; | 295 | break; |
296 | case IRQT_HIGH: | 296 | case IRQ_TYPE_LEVEL_HIGH: |
297 | gpio_int_type1[port] &= ~port_mask; | 297 | gpio_int_type1[port] &= ~port_mask; |
298 | gpio_int_type2[port] |= port_mask; | 298 | gpio_int_type2[port] |= port_mask; |
299 | desc->handle_irq = handle_level_irq; | 299 | desc->handle_irq = handle_level_irq; |
300 | break; | 300 | break; |
301 | case IRQT_LOW: | 301 | case IRQ_TYPE_LEVEL_LOW: |
302 | gpio_int_type1[port] &= ~port_mask; | 302 | gpio_int_type1[port] &= ~port_mask; |
303 | gpio_int_type2[port] &= ~port_mask; | 303 | gpio_int_type2[port] &= ~port_mask; |
304 | desc->handle_irq = handle_level_irq; | 304 | desc->handle_irq = handle_level_irq; |
305 | break; | 305 | break; |
306 | case IRQT_BOTHEDGE: | 306 | case IRQ_TYPE_EDGE_BOTH: |
307 | gpio_int_type1[port] |= port_mask; | 307 | gpio_int_type1[port] |= port_mask; |
308 | /* set initial polarity based on current input level */ | 308 | /* set initial polarity based on current input level */ |
309 | if (gpio_get_value(gpio)) | 309 | if (gpio_get_value(gpio)) |