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/mfd | |
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/mfd')
-rw-r--r-- | drivers/mfd/asic3.c | 14 | ||||
-rw-r--r-- | drivers/mfd/tc6393xb.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index eabf0bfccab4..c6408a62d95e 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
@@ -256,28 +256,28 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type) | |||
256 | bank + ASIC3_GPIO_TRIGGER_TYPE); | 256 | bank + ASIC3_GPIO_TRIGGER_TYPE); |
257 | asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit; | 257 | asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit; |
258 | 258 | ||
259 | if (type == IRQT_RISING) { | 259 | if (type == IRQ_TYPE_EDGE_RISING) { |
260 | trigger |= bit; | 260 | trigger |= bit; |
261 | edge |= bit; | 261 | edge |= bit; |
262 | } else if (type == IRQT_FALLING) { | 262 | } else if (type == IRQ_TYPE_EDGE_FALLING) { |
263 | trigger |= bit; | 263 | trigger |= bit; |
264 | edge &= ~bit; | 264 | edge &= ~bit; |
265 | } else if (type == IRQT_BOTHEDGE) { | 265 | } else if (type == IRQ_TYPE_EDGE_BOTH) { |
266 | trigger |= bit; | 266 | trigger |= bit; |
267 | if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base)) | 267 | if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base)) |
268 | edge &= ~bit; | 268 | edge &= ~bit; |
269 | else | 269 | else |
270 | edge |= bit; | 270 | edge |= bit; |
271 | asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit; | 271 | asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit; |
272 | } else if (type == IRQT_LOW) { | 272 | } else if (type == IRQ_TYPE_LEVEL_LOW) { |
273 | trigger &= ~bit; | 273 | trigger &= ~bit; |
274 | level &= ~bit; | 274 | level &= ~bit; |
275 | } else if (type == IRQT_HIGH) { | 275 | } else if (type == IRQ_TYPE_LEVEL_HIGH) { |
276 | trigger &= ~bit; | 276 | trigger &= ~bit; |
277 | level |= bit; | 277 | level |= bit; |
278 | } else { | 278 | } else { |
279 | /* | 279 | /* |
280 | * if type == IRQT_NOEDGE, we should mask interrupts, but | 280 | * if type == IRQ_TYPE_NONE, we should mask interrupts, but |
281 | * be careful to not unmask them if mask was also called. | 281 | * be careful to not unmask them if mask was also called. |
282 | * Probably need internal state for mask. | 282 | * Probably need internal state for mask. |
283 | */ | 283 | */ |
@@ -343,7 +343,7 @@ static int __init asic3_irq_probe(struct platform_device *pdev) | |||
343 | ASIC3_INTMASK_GINTMASK); | 343 | ASIC3_INTMASK_GINTMASK); |
344 | 344 | ||
345 | set_irq_chained_handler(asic->irq_nr, asic3_irq_demux); | 345 | set_irq_chained_handler(asic->irq_nr, asic3_irq_demux); |
346 | set_irq_type(asic->irq_nr, IRQT_RISING); | 346 | set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING); |
347 | set_irq_data(asic->irq_nr, asic); | 347 | set_irq_data(asic->irq_nr, asic); |
348 | 348 | ||
349 | return 0; | 349 | return 0; |
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index 2d87501b6fd4..94e55e8e7ce6 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c | |||
@@ -324,7 +324,7 @@ static void tc6393xb_attach_irq(struct platform_device *dev) | |||
324 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 324 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
325 | } | 325 | } |
326 | 326 | ||
327 | set_irq_type(tc6393xb->irq, IRQT_FALLING); | 327 | set_irq_type(tc6393xb->irq, IRQ_TYPE_EDGE_FALLING); |
328 | set_irq_data(tc6393xb->irq, tc6393xb); | 328 | set_irq_data(tc6393xb->irq, tc6393xb); |
329 | set_irq_chained_handler(tc6393xb->irq, tc6393xb_irq); | 329 | set_irq_chained_handler(tc6393xb->irq, tc6393xb_irq); |
330 | } | 330 | } |