@@ -285,9 +285,6 @@ int omap4_cminst_wait_module_ready(u8 part, u16 inst, s16 cdoffs,
{
int i = 0;
- if (!clkctrl_offs)
- return 0;
-
omap_test_timeout(_is_module_ready(part, inst, cdoffs, clkctrl_offs),
MAX_MODULE_READY_TIME, i);
@@ -310,9 +307,6 @@ int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_off
{
int i = 0;
- if (!clkctrl_offs)
- return 0;
-
omap_test_timeout((_clkctrl_idlest(part, inst, cdoffs, clkctrl_offs) ==
CLKCTRL_IDLEST_DISABLED),
MAX_MODULE_DISABLE_TIME, i);
AM335x which will migrate to the OMAP4 APIs in subsequent patches has one CLKCTRL at offset 0. A similar check existed in the AM335x custom APIs and that was removed to fix a crash on boot in commit 169c82a (ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug). Do the same in the OMAP4 API to avoid any regressions on AM335x when it switches over to these APIs. Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> --- arch/arm/mach-omap2/cminst44xx.c | 6 ------ 1 file changed, 6 deletions(-)