diff options
author | Barry Song <21cnbao@gmail.com> | 2013-07-30 05:07:53 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-08-14 14:09:45 -0400 |
commit | e1c0e1a39c7ec1d5bb5f8493d4c76eadbe6abad1 (patch) | |
tree | f5e8e333d346740cdfc70553e7b67f088e0b4b0c | |
parent | fe74f7801abf6442c2a1b9b7a19b7e0c602bb03c (diff) |
ARM: prima2: pm: drop redundant postcore_initcall
This will delete some redundant calling of sirfsoc_of_pwrc_init() and
sirfsoc_memc_init() for non-CSR platforms if we use multi-platform.
Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/mach-prima2/pm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c index 3a944ed193ee..c4525a88e5da 100644 --- a/arch/arm/mach-prima2/pm.c +++ b/arch/arm/mach-prima2/pm.c | |||
@@ -88,12 +88,6 @@ static const struct platform_suspend_ops sirfsoc_pm_ops = { | |||
88 | .valid = suspend_valid_only_mem, | 88 | .valid = suspend_valid_only_mem, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | int __init sirfsoc_pm_init(void) | ||
92 | { | ||
93 | suspend_set_ops(&sirfsoc_pm_ops); | ||
94 | return 0; | ||
95 | } | ||
96 | |||
97 | static const struct of_device_id pwrc_ids[] = { | 91 | static const struct of_device_id pwrc_ids[] = { |
98 | { .compatible = "sirf,prima2-pwrc" }, | 92 | { .compatible = "sirf,prima2-pwrc" }, |
99 | {} | 93 | {} |
@@ -121,7 +115,6 @@ static int __init sirfsoc_of_pwrc_init(void) | |||
121 | 115 | ||
122 | return 0; | 116 | return 0; |
123 | } | 117 | } |
124 | postcore_initcall(sirfsoc_of_pwrc_init); | ||
125 | 118 | ||
126 | static const struct of_device_id memc_ids[] = { | 119 | static const struct of_device_id memc_ids[] = { |
127 | { .compatible = "sirf,prima2-memc" }, | 120 | { .compatible = "sirf,prima2-memc" }, |
@@ -152,4 +145,11 @@ static int __init sirfsoc_memc_init(void) | |||
152 | { | 145 | { |
153 | return platform_driver_register(&sirfsoc_memc_driver); | 146 | return platform_driver_register(&sirfsoc_memc_driver); |
154 | } | 147 | } |
155 | postcore_initcall(sirfsoc_memc_init); | 148 | |
149 | int __init sirfsoc_pm_init(void) | ||
150 | { | ||
151 | sirfsoc_of_pwrc_init(); | ||
152 | sirfsoc_memc_init(); | ||
153 | suspend_set_ops(&sirfsoc_pm_ops); | ||
154 | return 0; | ||
155 | } | ||