aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/gpio-v2.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-msm/gpio-v2.c')
-rw-r--r--arch/arm/mach-msm/gpio-v2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-msm/gpio-v2.c b/arch/arm/mach-msm/gpio-v2.c
index e00e4dee4274..997ded1270bf 100644
--- a/arch/arm/mach-msm/gpio-v2.c
+++ b/arch/arm/mach-msm/gpio-v2.c
@@ -328,12 +328,12 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
328 328
329 if (on) { 329 if (on) {
330 if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS)) 330 if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
331 set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 1); 331 irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 1);
332 set_bit(gpio, msm_gpio.wake_irqs); 332 set_bit(gpio, msm_gpio.wake_irqs);
333 } else { 333 } else {
334 clear_bit(gpio, msm_gpio.wake_irqs); 334 clear_bit(gpio, msm_gpio.wake_irqs);
335 if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS)) 335 if (bitmap_empty(msm_gpio.wake_irqs, NR_GPIO_IRQS))
336 set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 0); 336 irq_set_irq_wake(TLMM_SCSS_SUMMARY_IRQ, 0);
337 } 337 }
338 338
339 return 0; 339 return 0;
@@ -362,12 +362,12 @@ static int __devinit msm_gpio_probe(struct platform_device *dev)
362 362
363 for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) { 363 for (i = 0; i < msm_gpio.gpio_chip.ngpio; ++i) {
364 irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i); 364 irq = msm_gpio_to_irq(&msm_gpio.gpio_chip, i);
365 set_irq_chip(irq, &msm_gpio_irq_chip); 365 irq_set_chip(irq, &msm_gpio_irq_chip);
366 set_irq_handler(irq, handle_level_irq); 366 irq_set_handler(irq, handle_level_irq);
367 set_irq_flags(irq, IRQF_VALID); 367 set_irq_flags(irq, IRQF_VALID);
368 } 368 }
369 369
370 set_irq_chained_handler(TLMM_SCSS_SUMMARY_IRQ, 370 irq_set_chained_handler(TLMM_SCSS_SUMMARY_IRQ,
371 msm_summary_irq_handler); 371 msm_summary_irq_handler);
372 return 0; 372 return 0;
373} 373}
@@ -379,7 +379,7 @@ static int __devexit msm_gpio_remove(struct platform_device *dev)
379 if (ret < 0) 379 if (ret < 0)
380 return ret; 380 return ret;
381 381
382 set_irq_handler(TLMM_SCSS_SUMMARY_IRQ, NULL); 382 irq_set_handler(TLMM_SCSS_SUMMARY_IRQ, NULL);
383 383
384 return 0; 384 return 0;
385} 385}