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

Commit 020f9706 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: fix a pile of issues 



This patch fixes a number of sillies, from missing 'const' to using
'return' in void functions, to functions with no arguments not even
'void' and a cast which isn't required.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d9d060a9

arch/arm/mach-omap1/io.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void __init omap1_map_common_io(void) 
 * Common low-level hardware init for omap1. This should only get called from

 * board specific init.

 */

void __init omap1_init_common_hw()

void __init omap1_init_common_hw(void)

{

	/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort

	 * on a Posted Write in the TIPB Bridge".

arch/arm/plat-omap/include/mach/omapfb.h

+2 −2
Original line number Diff line number Diff line
@@ -353,8 +353,8 @@ struct omapfb_device { 
	u32			pseudo_palette[17];



	struct lcd_panel	*panel;			/* LCD panel */

	struct lcd_ctrl         *ctrl;			/* LCD controller */

	struct lcd_ctrl		*int_ctrl;		/* internal LCD ctrl */

	const struct lcd_ctrl	*ctrl;			/* LCD controller */

	const struct lcd_ctrl	*int_ctrl;		/* internal LCD ctrl */

	struct lcd_ctrl_extif	*ext_if;		/* LCD ctrl external

							   interface */

	struct device		*dev;

arch/arm/plat-omap/sram.c

+4 −4
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) 
	if (!_omap_sram_reprogram_clock)

		omap_sram_error();



	return _omap_sram_reprogram_clock(dpllctl, ckctl);

	_omap_sram_reprogram_clock(dpllctl, ckctl);

}



int __init omap1_sram_init(void)
@@ -282,7 +282,7 @@ void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, 
	if (!_omap2_sram_ddr_init)

		omap_sram_error();



	return _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,

	_omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,

			     base_cs, force_unlock);

}
@@ -294,7 +294,7 @@ void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type) 
	if (!_omap2_sram_reprogram_sdrc)

		omap_sram_error();



	return _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);

	_omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);

}



static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);

drivers/video/omap/omapfb_main.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void set_fb_fix(struct fb_info *fbi) 
	int bpp;



	rg = &plane->fbdev->mem_desc.region[plane->idx];

	fbi->screen_base	= (char __iomem *)rg->vaddr;

	fbi->screen_base	= rg->vaddr;

	fix->smem_start		= rg->paddr;

	fix->smem_len		= rg->size;