[ARM] omap: fix lots of 'Using plain integer as NULL pointer' (c0fc18c5) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-omap1/clock.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ static int calc_dsor_exp(struct clk *clk, unsigned long rate)
		return -EINVAL;

		parent = clk->parent;
		if (unlikely(parent == 0))
		if (unlikely(parent == NULL))
		return -EIO;

		realrate = parent->rate;
		@@ -499,7 +499,7 @@ static int omap1_clk_enable_generic(struct clk *clk)
		if (clk->flags & ALWAYS_ENABLED)
		return 0;

		if (unlikely(clk->enable_reg == 0)) {
		if (unlikely(clk->enable_reg == NULL)) {
		printk(KERN_ERR "clock.c: Enable for %s without enable code\n",
		clk->name);
		return -EINVAL;
		@@ -535,7 +535,7 @@ static void omap1_clk_disable_generic(struct clk *clk)
		__u16 regval16;
		__u32 regval32;

		if (clk->enable_reg == 0)
		if (clk->enable_reg == NULL)
		return;

		if (clk->flags & ENABLE_REG_32BIT) {
		@@ -577,7 +577,7 @@ static long omap1_clk_round_rate(struct clk *clk, unsigned long rate)
		return clk->parent->rate / (1 << dsor_exp);
		}

		if(clk->round_rate != 0)
		if (clk->round_rate != NULL)
		return clk->round_rate(clk, rate);

		return clk->rate;

arch/arm/mach-omap2/clock.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -251,7 +251,7 @@ int _omap2_clk_enable(struct clk *clk)
		if (clk->enable)
		return clk->enable(clk);

		if (unlikely(clk->enable_reg == 0)) {
		if (unlikely(clk->enable_reg == NULL)) {
		printk(KERN_ERR "clock.c: Enable for %s without enable code\n",
		clk->name);
		return 0; /* REVISIT: -EINVAL */
		@@ -283,7 +283,7 @@ void _omap2_clk_disable(struct clk *clk)
		return;
		}

		if (clk->enable_reg == 0) {
		if (clk->enable_reg == NULL) {
		/*
		* 'Independent' here refers to a clock which is not
		* controlled by its parent.
		@@ -477,7 +477,7 @@ long omap2_clksel_round_rate(struct clk *clk, unsigned long target_rate)
		/* Given a clock and a rate apply a clock specific rounding function */
		long omap2_clk_round_rate(struct clk *clk, unsigned long rate)
		{
		if (clk->round_rate != 0)
		if (clk->round_rate != NULL)
		return clk->round_rate(clk, rate);

		if (clk->flags & RATE_FIXED)
		@@ -566,7 +566,7 @@ u32 omap2_divisor_to_clksel(struct clk *clk, u32 div)
		*/
		void __iomem omap2_get_clksel(struct clk clk, u32 *field_mask)
		{
		if (unlikely((clk->clksel_reg == 0) \|\| (clk->clksel_mask == 0)))
		if (unlikely((clk->clksel_reg == NULL) \|\| (clk->clksel_mask == NULL)))
		return NULL;

		*field_mask = clk->clksel_mask;
		@@ -586,7 +586,7 @@ u32 omap2_clksel_get_divisor(struct clk *clk)
		void __iomem *div_addr;

		div_addr = omap2_get_clksel(clk, &field_mask);
		if (div_addr == 0)
		if (div_addr == NULL)
		return 0;

		field_val = __raw_readl(div_addr) & field_mask;
		@@ -605,7 +605,7 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate)
		return -EINVAL;

		div_addr = omap2_get_clksel(clk, &field_mask);
		if (div_addr == 0)
		if (div_addr == NULL)
		return -EINVAL;

		field_val = omap2_divisor_to_clksel(clk, new_div);
		@@ -643,7 +643,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
		return -EINVAL;

		/* dpll_ck, core_ck, virt_prcm_set; plus all clksel clocks */
		if (clk->set_rate != 0)
		if (clk->set_rate != NULL)
		ret = clk->set_rate(clk, rate);

		if (unlikely(ret == 0 && (clk->flags & RATE_PROPAGATES)))
		@@ -664,7 +664,7 @@ static u32 omap2_clksel_get_src_field(void __iomem **src_addr,
		const struct clksel_rate *clkr;

		*parent_div = 0;
		*src_addr = 0;
		*src_addr = NULL;

		clks = omap2_get_clksel_by_parent(clk, src_clk);
		if (clks == NULL)
		@@ -705,7 +705,7 @@ int omap2_clk_set_parent(struct clk clk, struct clk new_parent)

		field_val = omap2_clksel_get_src_field(&src_addr, new_parent,
		&field_mask, clk, &parent_div);
		if (src_addr == 0)
		if (src_addr == NULL)
		return -EINVAL;

		if (clk->usecount > 0)

arch/arm/mach-omap2/serial.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ void __init omap_serial_init()
		struct plat_serial8250_port *p = serial_platform_data + i;

		if (!(info->enabled_uarts & (1 << i))) {
		p->membase = 0;
		p->membase = NULL;
		p->mapbase = 0;
		continue;
		}

arch/arm/plat-omap/dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1233,7 +1233,7 @@ int omap_request_dma_chain(int dev_id, const char *dev_name,
		/* request and reserve DMA channels for the chain */
		for (i = 0; i < no_of_chans; i++) {
		err = omap_request_dma(dev_id, dev_name,
		callback, 0, &channels[i]);
		callback, NULL, &channels[i]);
		if (err < 0) {
		int j;
		for (j = 0; j < i; j++)

drivers/video/omap/omapfb_main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -740,7 +740,7 @@ static int omapfb_update_win(struct fb_info *fbi,
		int ret;

		omapfb_rqueue_lock(plane->fbdev);
		ret = omapfb_update_window_async(fbi, win, NULL, 0);
		ret = omapfb_update_window_async(fbi, win, NULL, NULL);
		omapfb_rqueue_unlock(plane->fbdev);

		return ret;
		@@ -768,7 +768,7 @@ static int omapfb_update_full_screen(struct fb_info *fbi)
		win.format = 0;

		omapfb_rqueue_lock(fbdev);
		r = fbdev->ctrl->update_window(fbi, &win, NULL, 0);
		r = fbdev->ctrl->update_window(fbi, &win, NULL, NULL);
		omapfb_rqueue_unlock(fbdev);

		return r;
		@@ -1047,7 +1047,7 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)
		win.height = 2;
		win.out_width = 2;
		win.out_height = 2;
		fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, 0);
		fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, NULL);
		}
		omapfb_rqueue_unlock(fbdev);
		}