Skip to content

Commit

Permalink
ARM: OMAP4+: hwmod code: remove clkdm requirement in _omap4_wait_targ…
Browse files Browse the repository at this point in the history
…et_*()

We're no longer requiring struct omap_hwmod records to contain a
clockdomain.  So we shouldn't return -EINVAL any more from
_omap4_wait_target_disable() or _omap4_wait_target_ready() if there's
no clockdomain defined, since that just gets passed back to the
caller.  This can result in pointless warnings under the relaxed data
format.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>
  • Loading branch information
Paul Walmsley committed Sep 23, 2012
1 parent 8bb9fde commit 2b026d1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/mach-omap2/omap_hwmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -927,10 +927,10 @@ static void _am33xx_enable_module(struct omap_hwmod *oh)
*/
static int _omap4_wait_target_disable(struct omap_hwmod *oh)
{
if (!oh || !oh->clkdm)
if (!oh)
return -EINVAL;

if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
if (oh->_int_flags & _HWMOD_NO_MPU_PORT || !oh->clkdm)
return 0;

if (oh->flags & HWMOD_NO_IDLEST)
Expand Down Expand Up @@ -2635,10 +2635,10 @@ static int _omap2_wait_target_ready(struct omap_hwmod *oh)
*/
static int _omap4_wait_target_ready(struct omap_hwmod *oh)
{
if (!oh || !oh->clkdm)
if (!oh)
return -EINVAL;

if (oh->flags & HWMOD_NO_IDLEST)
if (oh->flags & HWMOD_NO_IDLEST || !oh->clkdm)
return 0;

if (!_find_mpu_rt_port(oh))
Expand Down

0 comments on commit 2b026d1

Please sign in to comment.