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

Commit 4280943b authored Mar 31, 2013 by Rajendra Nayak Committed by Paul Walmsley Mar 31, 2013

ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag



_HWMOD_WAKEUP_ENABLED is currently unused across the hwmod
framework. Just get rid of it, so we have one less flag to
worry about.

Tested-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>

parent da91b89e

arch/arm/mach-omap2/omap_hwmod.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -610,8 +610,6 @@ static int _enable_wakeup(struct omap_hwmod oh, u32 v)

	/* XXX test pwrdm_get_wken for this hwmod's subsystem */		/* XXX test pwrdm_get_wken for this hwmod's subsystem */

	oh->_int_flags \|= _HWMOD_WAKEUP_ENABLED;

	return 0;		return 0;
	}		}

	@@ -645,8 +643,6 @@ static int _disable_wakeup(struct omap_hwmod oh, u32 v)

	/* XXX test pwrdm_get_wken for this hwmod's subsystem */		/* XXX test pwrdm_get_wken for this hwmod's subsystem */

	oh->_int_flags &= ~_HWMOD_WAKEUP_ENABLED;

	return 0;		return 0;
	}		}

arch/arm/mach-omap2/omap_hwmod.h

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -477,15 +477,13 @@ struct omap_hwmod_omap4_prcm {
	* These are for internal use only and are managed by the omap_hwmod code.		* These are for internal use only and are managed by the omap_hwmod code.
	*		*
	* _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module		* _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module
	* _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP
	* _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached		* _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached
	* _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) -		* _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) -
	* causes the first call to _enable() to only update the pinmux		* causes the first call to _enable() to only update the pinmux
	*/		*/
	#define _HWMOD_NO_MPU_PORT (1 << 0)		#define _HWMOD_NO_MPU_PORT (1 << 0)
	#define _HWMOD_WAKEUP_ENABLED (1 << 1)		#define _HWMOD_SYSCONFIG_LOADED (1 << 1)
	#define _HWMOD_SYSCONFIG_LOADED (1 << 2)		#define _HWMOD_SKIP_ENABLE (1 << 2)
	#define _HWMOD_SKIP_ENABLE (1 << 3)

	/*		/*
	* omap_hwmod._state definitions		* omap_hwmod._state definitions