From: Paul Bolle <pebolle@tiscali.nl>
To: Kevin Hilman <khilman@deeprootsystems.com>,
Tony Lindgren <tony@atomide.com>,
Russell King <linux@arm.linux.org.uk>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ARM: OMAP: remove some dead code
Date: Thu, 15 May 2014 21:16:21 +0200 [thread overview]
Message-ID: <1400181381.11786.18.camel@x220> (raw)
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(-)
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
--
1.9.0
WARNING: multiple messages have this Message-ID (diff)
From: pebolle@tiscali.nl (Paul Bolle)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP: remove some dead code
Date: Thu, 15 May 2014 21:16:21 +0200 [thread overview]
Message-ID: <1400181381.11786.18.camel@x220> (raw)
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(-)
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
--
1.9.0
next reply other threads:[~2014-05-15 19:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-15 19:16 Paul Bolle [this message]
2014-05-15 19:16 ` [PATCH] ARM: OMAP: remove some dead code Paul Bolle
2014-05-15 19:43 ` Aaro Koskinen
2014-05-15 19:43 ` Aaro Koskinen
2014-05-16 21:11 ` Tony Lindgren
2014-05-16 21:11 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400181381.11786.18.camel@x220 \
--to=pebolle@tiscali.nl \
--cc=khilman@deeprootsystems.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.