diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 17:27:36 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 19:02:51 -0400 |
commit | b51804bcf0774a8bc6af1e8bb6ae818f4b71173a (patch) | |
tree | a9efc29885c87f8674f886b9420af6c6e6e94455 /drivers/gpio/timbgpio.c | |
parent | 778b548ced16b4bdca7ee2b694796f22ac24437f (diff) |
gpio: Cleanup genirq namespace
Converted with coccinelle.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
LKML-Reference: <20110324212509.025730689@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/gpio/timbgpio.c')
-rw-r--r-- | drivers/gpio/timbgpio.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c index 58c8f30352dd..0265872e57d1 100644 --- a/drivers/gpio/timbgpio.c +++ b/drivers/gpio/timbgpio.c | |||
@@ -195,7 +195,7 @@ out: | |||
195 | 195 | ||
196 | static void timbgpio_irq(unsigned int irq, struct irq_desc *desc) | 196 | static void timbgpio_irq(unsigned int irq, struct irq_desc *desc) |
197 | { | 197 | { |
198 | struct timbgpio *tgpio = get_irq_data(irq); | 198 | struct timbgpio *tgpio = irq_get_handler_data(irq); |
199 | unsigned long ipr; | 199 | unsigned long ipr; |
200 | int offset; | 200 | int offset; |
201 | 201 | ||
@@ -291,16 +291,16 @@ static int __devinit timbgpio_probe(struct platform_device *pdev) | |||
291 | return 0; | 291 | return 0; |
292 | 292 | ||
293 | for (i = 0; i < pdata->nr_pins; i++) { | 293 | for (i = 0; i < pdata->nr_pins; i++) { |
294 | set_irq_chip_and_handler_name(tgpio->irq_base + i, | 294 | irq_set_chip_and_handler_name(tgpio->irq_base + i, |
295 | &timbgpio_irqchip, handle_simple_irq, "mux"); | 295 | &timbgpio_irqchip, handle_simple_irq, "mux"); |
296 | set_irq_chip_data(tgpio->irq_base + i, tgpio); | 296 | irq_set_chip_data(tgpio->irq_base + i, tgpio); |
297 | #ifdef CONFIG_ARM | 297 | #ifdef CONFIG_ARM |
298 | set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE); | 298 | set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE); |
299 | #endif | 299 | #endif |
300 | } | 300 | } |
301 | 301 | ||
302 | set_irq_data(irq, tgpio); | 302 | irq_set_handler_data(irq, tgpio); |
303 | set_irq_chained_handler(irq, timbgpio_irq); | 303 | irq_set_chained_handler(irq, timbgpio_irq); |
304 | 304 | ||
305 | return 0; | 305 | return 0; |
306 | 306 | ||
@@ -327,12 +327,12 @@ static int __devexit timbgpio_remove(struct platform_device *pdev) | |||
327 | if (irq >= 0 && tgpio->irq_base > 0) { | 327 | if (irq >= 0 && tgpio->irq_base > 0) { |
328 | int i; | 328 | int i; |
329 | for (i = 0; i < pdata->nr_pins; i++) { | 329 | for (i = 0; i < pdata->nr_pins; i++) { |
330 | set_irq_chip(tgpio->irq_base + i, NULL); | 330 | irq_set_chip(tgpio->irq_base + i, NULL); |
331 | set_irq_chip_data(tgpio->irq_base + i, NULL); | 331 | irq_set_chip_data(tgpio->irq_base + i, NULL); |
332 | } | 332 | } |
333 | 333 | ||
334 | set_irq_handler(irq, NULL); | 334 | irq_set_handler(irq, NULL); |
335 | set_irq_data(irq, NULL); | 335 | irq_set_handler_data(irq, NULL); |
336 | } | 336 | } |
337 | 337 | ||
338 | err = gpiochip_remove(&tgpio->gpio); | 338 | err = gpiochip_remove(&tgpio->gpio); |