From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/7] at91 : fix compilation warning
Date: Wed, 11 Jan 2012 15:55:40 +0100 [thread overview]
Message-ID: <1326293740-15735-8-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1326293740-15735-1-git-send-email-daniel.lezcano@linaro.org>
Move the clock routine in a function. That will prevent to have
a warning from the compiler to say there is unused variable.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
arch/arm/mach-at91/pm.c | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index f97bbfa..2250773 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -132,6 +132,28 @@ static int at91_pm_begin(suspend_state_t state)
return 0;
}
+static inline int at91_program_clock(unsigned long scsr)
+{
+#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
+ int i;
+
+ /* PCK0..PCK3 must be disabled, or configured to use clk32k */
+ for (i = 0; i < 4; i++) {
+ u32 css;
+
+ if ((scsr & (AT91_PMC_PCK0 << i)) == 0)
+ continue;
+
+ css = at91_sys_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS;
+ if (css != AT91_PMC_CSS_SLOW) {
+ pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);
+ return -1;
+ }
+ }
+#endif
+ return 0;
+}
+
/*
* Verify that all the clocks are correct before entering
* slow-clock mode.
@@ -139,7 +161,6 @@ static int at91_pm_begin(suspend_state_t state)
static int at91_pm_verify_clocks(void)
{
unsigned long scsr;
- int i;
scsr = at91_sys_read(AT91_PMC_SCSR);
@@ -162,21 +183,8 @@ static int at91_pm_verify_clocks(void)
}
}
-#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
- /* PCK0..PCK3 must be disabled, or configured to use clk32k */
- for (i = 0; i < 4; i++) {
- u32 css;
-
- if ((scsr & (AT91_PMC_PCK0 << i)) == 0)
- continue;
-
- css = at91_sys_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS;
- if (css != AT91_PMC_CSS_SLOW) {
- pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);
- return 0;
- }
- }
-#endif
+ if (at91_program_clock(scsr))
+ return 0;
return 1;
}
--
1.7.4.1
next prev parent reply other threads:[~2012-01-11 14:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 14:55 [PATCH 0/7] at91 : pm.h cleanups Daniel Lezcano
2012-01-11 14:55 ` [PATCH 1/7] at91 : coding style fixes Daniel Lezcano
2012-01-11 14:55 ` [PATCH 2/7] at91 : declare header name Daniel Lezcano
2012-01-11 14:55 ` [PATCH 3/7] at91 : group headers inclusion for the memory controller Daniel Lezcano
2012-01-11 14:55 ` [PATCH 4/7] at91 : convert pm.h macros to static inline functions Daniel Lezcano
2012-01-11 14:55 ` [PATCH 5/7] at91 : fix dirty hack for the selfrefresh function Daniel Lezcano
2012-01-11 15:10 ` Arnd Bergmann
2012-01-11 16:55 ` Russell King - ARM Linux
2012-01-11 18:27 ` Arnd Bergmann
2012-01-11 19:43 ` Russell King - ARM Linux
2012-01-12 14:41 ` Nicolas Ferre
2012-01-12 19:36 ` Russell King - ARM Linux
2012-01-13 0:38 ` Rob Lee
2012-01-13 9:29 ` Daniel Lezcano
2012-01-13 10:22 ` Russell King - ARM Linux
2012-01-13 15:48 ` Arnd Bergmann
2012-01-13 17:25 ` Rob Lee
2012-01-11 14:55 ` [PATCH 6/7] at91 : group selfrefresh functions Daniel Lezcano
2012-01-11 16:56 ` Russell King - ARM Linux
2012-01-11 14:55 ` Daniel Lezcano [this message]
2012-01-11 15:23 ` [PATCH 0/7] at91 : pm.h cleanups Arnd Bergmann
2012-01-11 16:29 ` Daniel Lezcano
2012-01-23 6:29 ` Jean-Christophe PLAGNIOL-VILLARD
2012-01-11 16:57 ` Russell King - ARM Linux
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=1326293740-15735-8-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).