Skip to contentSkip to conversation

ARM: OMAP: remove some dead code

PATCH In review Paul Bolle 3 participants 3 messages May 15, 2014 – May 16, 2014

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP1 support OMAP power management support
lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 ARM: OMAP: remove some dead code

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 <[email protected]>

---
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(-)
arch/arm/mach-omap1/pm.c +1 -12
index dbee729e3b6d..34b4c0044961 100644
@@ -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
Signature · 1 line
1.9.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Paul Bolle

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 <[email protected]>
Acked-by Aaro Koskinen <[email protected]>
Quoted 5 lines

---
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.

reviewer
#2 lore raw
Quoted 14 lines · Aaro Koskinen
Quoted 7 lines · Paul Bolle

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 <[email protected]>
Acked-by Aaro Koskinen <[email protected]>
Quoted 3 lines

---
Untested, as usual.

Quoted 6 lines
Quoted 2 lines

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