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

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

ARM: OMAP2+: clean up some cppcheck warnings 



Resolve some warnings identified by cppcheck in arch/arm/mach-omap2:

    [arch/arm/mach-omap2/usb-tusb6010.c:129]: (style) Checking if unsigned variable 'tmp' is less than zero.
    [arch/arm/mach-omap2/prm_common.c:241]: (error) Possible null pointer dereference: irq_setup - otherwise it is redundant to check if irq_setup is null at line 247
    [arch/arm/mach-omap2/pm34xx.c:790]: (style) Variable 'per_clkdm' is assigned a value that is never used
    [arch/arm/mach-omap2/pm34xx.c:790]: (style) Variable 'core_clkdm' is assigned a value that is never used
    [arch/arm/mach-omap2/pm24xx.c:185]: (style) Variable 'only_idle' is assigned a value that is never used
    [arch/arm/mach-omap2/mux.c:254]: (error) Possible null pointer dereference: mux
    [arch/arm/mach-omap2/mux.c:258]: (error) Possible null pointer dereference: mux
    [arch/arm/mach-omap2/gpmc-onenand.c:178]: (style) Variable 'tick_ns' is assigned a value that is never used
    [arch/arm/mach-omap2/gpio.c:56]: (error) Possible null pointer dereference: pdata - otherwise it is redundant to check if pdata is null at line 57
    [arch/arm/mach-omap2/devices.c:45]: (style) Variable 'l' is assigned a value that is never used
    [arch/arm/mach-omap2/board-omap3evm.c:641] -> [arch/arm/mach-omap2/board-omap3evm.c:639]: (style) Found duplicate branches for if and else.
    [arch/arm/mach-omap2/am35xx-emac.c:95]: (style) Variable 'regval' is assigned a value that is never used
    [arch/arm/mach-omap2/devices.c:74]: (style) Variable 'l' is assigned a value that is never used
    [arch/arm/mach-omap2/pm34xx.c:277]: (style) Variable 'per_prev_state' is assigned a value that is never used
    [arch/arm/plat-omap/dmtimer.c:352]: (error) Possible null pointer dereference: timer - otherwise it is redundant to check if timer is null at line 354
    [arch/arm/plat-omap/omap_device.c:478]: (style) Variable 'c' is assigned a value that is never used
    [arch/arm/plat-omap/usb.c:42]: (style) Variable 'status' is assigned a value that is never used
    [arch/arm/mach-omap1/clock.c:197]: (style) Variable 'dpll1_rate' is assigned a value that is never used
    [arch/arm/mach-omap1/lcd_dma.c:60]: (style) struct or union member 'lcd_dma_info::size' is never used
    [arch/arm/mach-omap1/pm.c:572]: (style) Variable 'entry' is assigned a value that is never used

Some of them are pretty good catches, such as gpio.c:56 and
usb-tusb6010.c:129.

Thanks to Jarkko Nikula for some comments on the sscanf() warnings.
It seems that the kernel sscanf() ignores the field width anyway for the
%d format, so those changes have been dropped from this second version.

Thanks to Daniel Marjamäki <daniel.marjamaki@gmail.com> for pointing
out that a variable was unnecessarily marked static in the
board-omap3evm.c change.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Charulatha Varadarajan <charu@ti.com>
Cc: Daniel Marjamäki <daniel.marjamaki@gmail.com>
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Reviewed-by: Charulatha Varadarajan <charu@ti.com> # for gpio.c
parent 31cde044

arch/arm/mach-omap1/clock.c

+1 −2
Original line number Diff line number Diff line
@@ -194,9 +194,8 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate) 
{

	/* Find the highest supported frequency <= rate and switch to it */

	struct mpu_rate * ptr;

	unsigned long dpll1_rate, ref_rate;

	unsigned long ref_rate;



	dpll1_rate = ck_dpll1_p->rate;

	ref_rate = ck_ref_p->rate;



	for (ptr = omap1_rate_table; ptr->rate; ptr++) {

arch/arm/mach-omap1/lcd_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static struct lcd_dma_info { 
	void *cb_data;



	int active;

	unsigned long addr, size;

	unsigned long addr;

	int rotate, data_type, xres, yres;

	int vxres;

	int mirror;

arch/arm/mach-omap1/pm.c

+4 −5
Original line number Diff line number Diff line
@@ -569,9 +569,8 @@ static int omap_pm_read_proc( 


static void omap_pm_init_proc(void)

{

	struct proc_dir_entry *entry;



	entry = create_proc_read_entry("driver/omap_pm",

	/* XXX Appears to leak memory */

	create_proc_read_entry("driver/omap_pm",

			       S_IWUSR | S_IRUGO, NULL,

			       omap_pm_read_proc, NULL);

}

arch/arm/mach-omap2/am35xx-emac.c

+17 −20
Original line number Diff line number Diff line
@@ -39,26 +39,23 @@ static struct platform_device am35xx_emac_mdio_device = { 


static void am35xx_enable_emac_int(void)

{

	u32 regval;



	regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);

	regval = (regval | AM35XX_CPGMAC_C0_RX_PULSE_CLR |

		  AM35XX_CPGMAC_C0_TX_PULSE_CLR |

		  AM35XX_CPGMAC_C0_MISC_PULSE_CLR |

		  AM35XX_CPGMAC_C0_RX_THRESH_CLR);

	omap_ctrl_writel(regval, AM35XX_CONTROL_LVL_INTR_CLEAR);

	regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);

	u32 v;



	v = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);

	v |= (AM35XX_CPGMAC_C0_RX_PULSE_CLR | AM35XX_CPGMAC_C0_TX_PULSE_CLR |

	      AM35XX_CPGMAC_C0_MISC_PULSE_CLR | AM35XX_CPGMAC_C0_RX_THRESH_CLR);

	omap_ctrl_writel(v, AM35XX_CONTROL_LVL_INTR_CLEAR);

	omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); /* OCP barrier */

}



static void am35xx_disable_emac_int(void)

{

	u32 regval;

	u32 v;



	regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);

	regval = (regval | AM35XX_CPGMAC_C0_RX_PULSE_CLR |

		  AM35XX_CPGMAC_C0_TX_PULSE_CLR);

	omap_ctrl_writel(regval, AM35XX_CONTROL_LVL_INTR_CLEAR);

	regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);

	v = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);

	v |= (AM35XX_CPGMAC_C0_RX_PULSE_CLR | AM35XX_CPGMAC_C0_TX_PULSE_CLR);

	omap_ctrl_writel(v, AM35XX_CONTROL_LVL_INTR_CLEAR);

	omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); /* OCP barrier */

}



static struct emac_platform_data am35xx_emac_pdata = {
@@ -92,7 +89,7 @@ static struct platform_device am35xx_emac_device = { 


void __init am35xx_emac_init(unsigned long mdio_bus_freq, u8 rmii_en)

{

	unsigned int regval;

	u32 v;

	int err;



	am35xx_emac_pdata.rmii_en = rmii_en;
@@ -110,8 +107,8 @@ void __init am35xx_emac_init(unsigned long mdio_bus_freq, u8 rmii_en) 
		return;

	}



	regval = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);

	regval = regval & (~(AM35XX_CPGMACSS_SW_RST));

	omap_ctrl_writel(regval, AM35XX_CONTROL_IP_SW_RESET);

	regval = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);

	v = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);

	v &= ~AM35XX_CPGMACSS_SW_RST;

	omap_ctrl_writel(v, AM35XX_CONTROL_IP_SW_RESET);

	omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET); /* OCP barrier */

}

arch/arm/mach-omap2/board-omap3evm.c

+4 −4
Original line number Diff line number Diff line
@@ -630,13 +630,13 @@ static struct regulator_consumer_supply dummy_supplies[] = { 


static void __init omap3_evm_init(void)

{

	struct omap_board_mux *obm;



	omap3_evm_get_revision();

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	if (cpu_is_omap3630())

		omap3_mux_init(omap36x_board_mux, OMAP_PACKAGE_CBB);

	else

		omap3_mux_init(omap35x_board_mux, OMAP_PACKAGE_CBB);

	obm = (cpu_is_omap3630()) ? omap36x_board_mux : omap35x_board_mux;

	omap3_mux_init(obm, OMAP_PACKAGE_CBB);



	omap_board_config = omap3_evm_config;

	omap_board_config_size = ARRAY_SIZE(omap3_evm_config);