diff options
-rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/dmtimer.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index fcce7ff37630..31197bd2dedc 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c | |||
@@ -102,7 +102,7 @@ void __init ams_delta_init_fiq(void) | |||
102 | } | 102 | } |
103 | 103 | ||
104 | retval = request_irq(INT_DEFERRED_FIQ, deferred_fiq, | 104 | retval = request_irq(INT_DEFERRED_FIQ, deferred_fiq, |
105 | IRQ_TYPE_EDGE_RISING, "deferred_fiq", 0); | 105 | IRQ_TYPE_EDGE_RISING, "deferred_fiq", NULL); |
106 | if (retval < 0) { | 106 | if (retval < 0) { |
107 | pr_err("Failed to get deferred_fiq IRQ, ret=%d\n", retval); | 107 | pr_err("Failed to get deferred_fiq IRQ, ret=%d\n", retval); |
108 | release_fiq(&fh); | 108 | release_fiq(&fh); |
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index a2c5abcd7c84..61ed4f0247ce 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
@@ -289,10 +289,10 @@ palmz71_gpio_setup(int early) | |||
289 | gpio_direction_input(PALMZ71_USBDETECT_GPIO); | 289 | gpio_direction_input(PALMZ71_USBDETECT_GPIO); |
290 | if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO), | 290 | if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO), |
291 | palmz71_powercable, IRQF_SAMPLE_RANDOM, | 291 | palmz71_powercable, IRQF_SAMPLE_RANDOM, |
292 | "palmz71-cable", 0)) | 292 | "palmz71-cable", NULL)) |
293 | printk(KERN_ERR | 293 | printk(KERN_ERR |
294 | "IRQ request for power cable failed!\n"); | 294 | "IRQ request for power cable failed!\n"); |
295 | palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), 0); | 295 | palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), NULL); |
296 | } | 296 | } |
297 | } | 297 | } |
298 | 298 | ||
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 14fbc781338f..80f3ced0bd1a 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -335,7 +335,7 @@ void omap_intc_restore_context(void) | |||
335 | void omap3_intc_suspend(void) | 335 | void omap3_intc_suspend(void) |
336 | { | 336 | { |
337 | /* A pending interrupt would prevent OMAP from entering suspend */ | 337 | /* A pending interrupt would prevent OMAP from entering suspend */ |
338 | omap_ack_irq(0); | 338 | omap_ack_irq(NULL); |
339 | } | 339 | } |
340 | 340 | ||
341 | void omap3_intc_prepare_idle(void) | 341 | void omap3_intc_prepare_idle(void) |
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h index 9418f00b6c38..230ff91be491 100644 --- a/arch/arm/plat-omap/include/plat/dmtimer.h +++ b/arch/arm/plat-omap/include/plat/dmtimer.h | |||
@@ -316,12 +316,12 @@ static inline void __omap_dm_timer_init_regs(struct omap_dm_timer *timer) | |||
316 | OMAP_TIMER_V1_SYS_STAT_OFFSET; | 316 | OMAP_TIMER_V1_SYS_STAT_OFFSET; |
317 | timer->irq_stat = timer->io_base + OMAP_TIMER_V1_STAT_OFFSET; | 317 | timer->irq_stat = timer->io_base + OMAP_TIMER_V1_STAT_OFFSET; |
318 | timer->irq_ena = timer->io_base + OMAP_TIMER_V1_INT_EN_OFFSET; | 318 | timer->irq_ena = timer->io_base + OMAP_TIMER_V1_INT_EN_OFFSET; |
319 | timer->irq_dis = 0; | 319 | timer->irq_dis = NULL; |
320 | timer->pend = timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET; | 320 | timer->pend = timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET; |
321 | timer->func_base = timer->io_base; | 321 | timer->func_base = timer->io_base; |
322 | } else { | 322 | } else { |
323 | timer->revision = 2; | 323 | timer->revision = 2; |
324 | timer->sys_stat = 0; | 324 | timer->sys_stat = NULL; |
325 | timer->irq_stat = timer->io_base + OMAP_TIMER_V2_IRQSTATUS; | 325 | timer->irq_stat = timer->io_base + OMAP_TIMER_V2_IRQSTATUS; |
326 | timer->irq_ena = timer->io_base + OMAP_TIMER_V2_IRQENABLE_SET; | 326 | timer->irq_ena = timer->io_base + OMAP_TIMER_V2_IRQENABLE_SET; |
327 | timer->irq_dis = timer->io_base + OMAP_TIMER_V2_IRQENABLE_CLR; | 327 | timer->irq_dis = timer->io_base + OMAP_TIMER_V2_IRQENABLE_CLR; |