Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7022d60 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP: fix 'using plain integer as NULL pointer' sparse warnings 



sparse warns when 0 is passed to a function expecting a pointer argument.
Resolve these warnings by replacing the 0 with NULL.

arch/arm/plat-omap/include/plat/dmtimer.h:319:34: warning: Using plain integer as NULL pointer
arch/arm/plat-omap/include/plat/dmtimer.h:324:35: warning: Using plain integer as NULL pointer
arch/arm/mach-omap2/irq.c:294:22: warning: Using plain integer as NULL pointer
arch/arm/mach-omap1/board-palmz71.c:292:50: warning: Using plain integer as NULL pointer
arch/arm/mach-omap1/board-palmz71.c:295:73: warning: Using plain integer as NULL pointer
arch/arm/mach-omap1/ams-delta-fiq.c:105:63: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 355f8eee

arch/arm/mach-omap1/ams-delta-fiq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ void __init ams_delta_init_fiq(void) 
	}

	}





	retval = request_irq(INT_DEFERRED_FIQ, deferred_fiq,

	retval = request_irq(INT_DEFERRED_FIQ, deferred_fiq,

			IRQ_TYPE_EDGE_RISING, "deferred_fiq", 0);

			IRQ_TYPE_EDGE_RISING, "deferred_fiq", NULL);

	if (retval < 0) {

	if (retval < 0) {

		pr_err("Failed to get deferred_fiq IRQ, ret=%d\n", retval);

		pr_err("Failed to get deferred_fiq IRQ, ret=%d\n", retval);

		release_fiq(&fh);

		release_fiq(&fh);

arch/arm/mach-omap1/board-palmz71.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -289,10 +289,10 @@ palmz71_gpio_setup(int early) 
		gpio_direction_input(PALMZ71_USBDETECT_GPIO);

		gpio_direction_input(PALMZ71_USBDETECT_GPIO);

		if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO),

		if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO),

				palmz71_powercable, IRQF_SAMPLE_RANDOM,

				palmz71_powercable, IRQF_SAMPLE_RANDOM,

				"palmz71-cable", 0))

				"palmz71-cable", NULL))

			printk(KERN_ERR

			printk(KERN_ERR

					"IRQ request for power cable failed!\n");

					"IRQ request for power cable failed!\n");

		palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), 0);

		palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), NULL);

	}

	}

}

}

arch/arm/mach-omap2/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -335,7 +335,7 @@ void omap_intc_restore_context(void) 
void omap3_intc_suspend(void)

void omap3_intc_suspend(void)

{

{

	/* A pending interrupt would prevent OMAP from entering suspend */

	/* A pending interrupt would prevent OMAP from entering suspend */

	omap_ack_irq(0);

	omap_ack_irq(NULL);

}

}





void omap3_intc_prepare_idle(void)

void omap3_intc_prepare_idle(void)

arch/arm/plat-omap/include/plat/dmtimer.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -316,12 +316,12 @@ static inline void __omap_dm_timer_init_regs(struct omap_dm_timer *timer) 
				OMAP_TIMER_V1_SYS_STAT_OFFSET;

				OMAP_TIMER_V1_SYS_STAT_OFFSET;

		timer->irq_stat = timer->io_base + OMAP_TIMER_V1_STAT_OFFSET;

		timer->irq_stat = timer->io_base + OMAP_TIMER_V1_STAT_OFFSET;

		timer->irq_ena = timer->io_base + OMAP_TIMER_V1_INT_EN_OFFSET;

		timer->irq_ena = timer->io_base + OMAP_TIMER_V1_INT_EN_OFFSET;

		timer->irq_dis = 0;

		timer->irq_dis = NULL;

		timer->pend = timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET;

		timer->pend = timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET;

		timer->func_base = timer->io_base;

		timer->func_base = timer->io_base;

	} else {

	} else {

		timer->revision = 2;

		timer->revision = 2;

		timer->sys_stat = 0;

		timer->sys_stat = NULL;

		timer->irq_stat = timer->io_base + OMAP_TIMER_V2_IRQSTATUS;

		timer->irq_stat = timer->io_base + OMAP_TIMER_V2_IRQSTATUS;

		timer->irq_ena = timer->io_base + OMAP_TIMER_V2_IRQENABLE_SET;

		timer->irq_ena = timer->io_base + OMAP_TIMER_V2_IRQENABLE_SET;

		timer->irq_dis = timer->io_base + OMAP_TIMER_V2_IRQENABLE_CLR;

		timer->irq_dis = timer->io_base + OMAP_TIMER_V2_IRQENABLE_CLR;