From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH] ARM: shmobile: r8a7740: Cleanup PM Kconfig usage
Date: Thu, 04 Sep 2014 03:39:42 +0000 [thread overview]
Message-ID: <20140904033942.22881.84361.sendpatchset@w520> (raw)
From: Magnus Damm <damm+renesas@opensource.se>
Simplify the r8a7740 PM code by using CONFIG_PM_RMOBILE instead
of having a complex #if expression embedded in the C code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
Built on top of renesas-devel-20140904-v3.17-rc3
arch/arm/mach-shmobile/pm-r8a7740.c | 6 ++++--
arch/arm/mach-shmobile/r8a7740.h | 7 +------
2 files changed, 5 insertions(+), 8 deletions(-)
--- 0001/arch/arm/mach-shmobile/pm-r8a7740.c
+++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-09-04 12:29:12.000000000 +0900
@@ -13,7 +13,7 @@
#include "common.h"
#include "pm-rmobile.h"
-#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
+#ifdef CONFIG_PM_RMOBILE
static int r8a7740_pd_a4s_suspend(void)
{
/*
@@ -58,7 +58,9 @@ void __init r8a7740_init_pm_domains(void
rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
pm_genpd_add_subdomain_names("A4S", "A3SP");
}
-#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
+#else
+void r8a7740_init_pm_domains(void) {}
+#endif
#ifdef CONFIG_SUSPEND
static int r8a7740_enter_suspend(suspend_state_t suspend_state)
--- 0001/arch/arm/mach-shmobile/r8a7740.h
+++ work/arch/arm/mach-shmobile/r8a7740.h 2014-09-04 12:29:12.000000000 +0900
@@ -52,11 +52,6 @@ extern void r8a7740_add_standard_devices
extern void r8a7740_clock_init(u8 md_ck);
extern void r8a7740_pinmux_init(void);
extern void r8a7740_pm_init(void);
-
-#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
-extern void __init r8a7740_init_pm_domains(void);
-#else
-static inline void r8a7740_init_pm_domains(void) {}
-#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
+extern void r8a7740_init_pm_domains(void);
#endif /* __ASM_R8A7740_H__ */
next reply other threads:[~2014-09-04 3:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-04 3:39 Magnus Damm [this message]
2014-09-04 4:12 ` [PATCH] ARM: shmobile: r8a7740: Cleanup PM Kconfig usage Simon Horman
2014-09-04 4:17 ` Magnus Damm
2014-09-04 4:25 ` Simon Horman
2014-09-04 4:29 ` Simon Horman
2014-09-04 6:31 ` Geert Uytterhoeven
2014-09-24 0:54 ` Simon Horman
2014-09-30 4:25 ` Simon Horman
2014-09-30 7:12 ` Geert Uytterhoeven
2014-09-30 8:11 ` Simon Horman
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=20140904033942.22881.84361.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-sh@vger.kernel.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).