Commit da7a0649 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren

ARM: OMAP: Remove useless omap_sram_error function.

This patch removes fixes omap_sram_error() function and replace the
error paths with BUG_ON.

The proposed fix was suggested by Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ce8a17fd
...@@ -242,20 +242,13 @@ void * omap_sram_push(void * start, unsigned long size) ...@@ -242,20 +242,13 @@ void * omap_sram_push(void * start, unsigned long size)
return (void *)omap_sram_ceil; return (void *)omap_sram_ceil;
} }
static void omap_sram_error(void)
{
panic("Uninitialized SRAM function\n");
}
#ifdef CONFIG_ARCH_OMAP1 #ifdef CONFIG_ARCH_OMAP1
static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl); static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl);
void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl)
{ {
if (!_omap_sram_reprogram_clock) BUG_ON(!_omap_sram_reprogram_clock);
omap_sram_error();
_omap_sram_reprogram_clock(dpllctl, ckctl); _omap_sram_reprogram_clock(dpllctl, ckctl);
} }
...@@ -280,9 +273,7 @@ static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, ...@@ -280,9 +273,7 @@ static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,
void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,
u32 base_cs, u32 force_unlock) u32 base_cs, u32 force_unlock)
{ {
if (!_omap2_sram_ddr_init) BUG_ON(!_omap2_sram_ddr_init);
omap_sram_error();
_omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl, _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,
base_cs, force_unlock); base_cs, force_unlock);
} }
...@@ -292,9 +283,7 @@ static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val, ...@@ -292,9 +283,7 @@ static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val,
void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type) void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type)
{ {
if (!_omap2_sram_reprogram_sdrc) BUG_ON(!_omap2_sram_reprogram_sdrc);
omap_sram_error();
_omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type); _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);
} }
...@@ -302,9 +291,7 @@ static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass); ...@@ -302,9 +291,7 @@ static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);
u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass) u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass)
{ {
if (!_omap2_set_prcm) BUG_ON(!_omap2_set_prcm);
omap_sram_error();
return _omap2_set_prcm(dpll_ctrl_val, sdrc_rfr_val, bypass); return _omap2_set_prcm(dpll_ctrl_val, sdrc_rfr_val, bypass);
} }
#endif #endif
...@@ -360,9 +347,7 @@ static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl, ...@@ -360,9 +347,7 @@ static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl,
u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla, u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla,
u32 sdrc_actim_ctrlb, u32 m2) u32 sdrc_actim_ctrlb, u32 m2)
{ {
if (!_omap3_sram_configure_core_dpll) BUG_ON(!_omap3_sram_configure_core_dpll);
omap_sram_error();
return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl, return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl,
sdrc_actim_ctrla, sdrc_actim_ctrla,
sdrc_actim_ctrlb, m2); sdrc_actim_ctrlb, m2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment