Commit 34617e2a authored by Benoit Cousson's avatar Benoit Cousson Committed by Paul Walmsley
Browse files

OMAP: hwmod: Move pr_debug to improve the readability 



Move the pr_debug at the top of the function
to trace the entry even if the first test is failing.
That help understanding that we entered the function
but failed in it.

Move the _enable last part out of the test to reduce
indentation and improve readability.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 6652271a

arch/arm/mach-omap2/omap_hwmod.c

+17 −15
Original line number Diff line number Diff line
@@ -1242,6 +1242,8 @@ static int _enable(struct omap_hwmod *oh) 
{

	int r;



	pr_debug("omap_hwmod: %s: enabling\n", oh->name);



	if (oh->_state != _HWMOD_STATE_INITIALIZED &&

	    oh->_state != _HWMOD_STATE_IDLE &&

	    oh->_state != _HWMOD_STATE_DISABLED) {
@@ -1250,8 +1252,6 @@ static int _enable(struct omap_hwmod *oh) 
		return -EINVAL;

	}



	pr_debug("omap_hwmod: %s: enabling\n", oh->name);



	/* Mux pins for device runtime if populated */

	if (oh->mux && (!oh->mux->enabled ||

			((oh->_state == _HWMOD_STATE_IDLE) &&
@@ -1271,7 +1271,14 @@ static int _enable(struct omap_hwmod *oh) 
		_deassert_hardreset(oh, oh->rst_lines[0].name);



	r = _wait_target_ready(oh);

	if (!r) {

	if (r) {

		pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",

			 oh->name, r);

		_disable_clocks(oh);



		return r;

	}



	oh->_state = _HWMOD_STATE_ENABLED;



	/* Access the sysconfig only if the target is ready */
@@ -1280,11 +1287,6 @@ static int _enable(struct omap_hwmod *oh) 
			_update_sysc_cache(oh);

		_enable_sysc(oh);

	}

	} else {

		_disable_clocks(oh);

		pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",

			 oh->name, r);

	}



	return r;

}
@@ -1299,14 +1301,14 @@ static int _enable(struct omap_hwmod *oh) 
 */

static int _idle(struct omap_hwmod *oh)

{

	pr_debug("omap_hwmod: %s: idling\n", oh->name);



	if (oh->_state != _HWMOD_STATE_ENABLED) {

		WARN(1, "omap_hwmod: %s: idle state can only be entered from "

		     "enabled state\n", oh->name);

		return -EINVAL;

	}



	pr_debug("omap_hwmod: %s: idling\n", oh->name);



	if (oh->class->sysc)

		_idle_sysc(oh);

	_del_initiator_dep(oh, mpu_oh);

CRA Git | Maintained and supported by SUSTech CRA and CCSE