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

Commit 4f8a428d authored by Russell King's avatar Russell King
Browse files

ARM: omap: fix wrapped error messages in omap_hwmod.c 



While trying to debug my OMAP platforms, they emitted this message:

omap_hwmod: %s: enabled state can only be entered from initialized, idle, or disabled state

The following backtrace said it was from a function called '_enable',
which didn't provide much clue.  Grepping didn't find it either.

The message is wrapped, so unwrap the message so grep can find it.  Do
the same for three other messages in this file.

Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8930b4e3

arch/arm/mach-omap2/omap_hwmod.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1517,8 +1517,8 @@ static int _enable(struct omap_hwmod *oh) 
	if (oh->_state != _HWMOD_STATE_INITIALIZED &&

	if (oh->_state != _HWMOD_STATE_INITIALIZED &&

	    oh->_state != _HWMOD_STATE_IDLE &&

	    oh->_state != _HWMOD_STATE_IDLE &&

	    oh->_state != _HWMOD_STATE_DISABLED) {

	    oh->_state != _HWMOD_STATE_DISABLED) {

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

		WARN(1, "omap_hwmod: %s: enabled state can only be entered from initialized, idle, or disabled state\n",

		     "from initialized, idle, or disabled state\n", oh->name);

			oh->name);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -1600,8 +1600,8 @@ static int _idle(struct omap_hwmod *oh) 
	pr_debug("omap_hwmod: %s: idling\n", oh->name);

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





	if (oh->_state != _HWMOD_STATE_ENABLED) {

	if (oh->_state != _HWMOD_STATE_ENABLED) {

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

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

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

			oh->name);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -1682,8 +1682,8 @@ static int _shutdown(struct omap_hwmod *oh) 




	if (oh->_state != _HWMOD_STATE_IDLE &&

	if (oh->_state != _HWMOD_STATE_IDLE &&

	    oh->_state != _HWMOD_STATE_ENABLED) {

	    oh->_state != _HWMOD_STATE_ENABLED) {

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

		WARN(1, "omap_hwmod: %s: disabled state can only be entered from idle, or enabled state\n",

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

			oh->name);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -2240,8 +2240,8 @@ void omap_hwmod_ocp_barrier(struct omap_hwmod *oh) 
	BUG_ON(!oh);

	BUG_ON(!oh);





	if (!oh->class->sysc || !oh->class->sysc->sysc_flags) {

	if (!oh->class->sysc || !oh->class->sysc->sysc_flags) {

		WARN(1, "omap_device: %s: OCP barrier impossible due to "

		WARN(1, "omap_device: %s: OCP barrier impossible due to device configuration\n",

		      "device configuration\n", oh->name);

			oh->name);

		return;

		return;

	}

	}