| Message ID | 1400181381.11786.18.camel@x220 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 15, 2014 at 09:16:21PM +0200, Paul Bolle wrote: > A check for CONFIG_CBUS_TAHVO_USB was added in v2.6.17. The related > Kconfig symbol has never been part of the tree. Remove that check. > > Replace the while (...) loop with a simple if (...) statement, while > we're at it. > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> > --- > Untested, as usual. > > A quick search across the history of the tree suggests CBUS_TAHVO_USB > was N770 related. Not that this matters much. Yes, Tahvo USB is only used on Nokia 770 (which is the correct name, not N770). The driver is nowadays behind TAHVO_USB, but like you said the old symbol was never part of the mainline so it's OK to delete it. A.
* Aaro Koskinen <aaro.koskinen@iki.fi> [140515 12:48]: > On Thu, May 15, 2014 at 09:16:21PM +0200, Paul Bolle wrote: > > A check for CONFIG_CBUS_TAHVO_USB was added in v2.6.17. The related > > Kconfig symbol has never been part of the tree. Remove that check. > > > > Replace the while (...) loop with a simple if (...) statement, while > > we're at it. > > > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > > Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> > > > --- > > Untested, as usual. > > > > A quick search across the history of the tree suggests CBUS_TAHVO_USB > > was N770 related. Not that this matters much. > > Yes, Tahvo USB is only used on Nokia 770 (which is the correct name, > not N770). The driver is nowadays behind TAHVO_USB, but like you said > the old symbol was never part of the mainline so it's OK to delete it. Thanks applying into omap-for-v3.16/board. Tony
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index dbee729e3b6d..34b4c0044961 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -123,19 +123,8 @@ void omap1_pm_idle(void) #warning Enable 32kHz OS timer in order to allow sleep states in idle use_idlect1 = use_idlect1 & ~(1 << 9); #else - - while (enable_dyn_sleep) { - -#ifdef CONFIG_CBUS_TAHVO_USB - extern int vbus_active; - /* Clock requirements? */ - if (vbus_active) - break; -#endif + if (enable_dyn_sleep) do_sleep = 1; - break; - } - #endif #ifdef CONFIG_OMAP_DM_TIMER
A check for CONFIG_CBUS_TAHVO_USB was added in v2.6.17. The related Kconfig symbol has never been part of the tree. Remove that check. Replace the while (...) loop with a simple if (...) statement, while we're at it. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested, as usual. A quick search across the history of the tree suggests CBUS_TAHVO_USB was N770 related. Not that this matters much. arch/arm/mach-omap1/pm.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)