diff options
| author | Barry Song <21cnbao@gmail.com> | 2013-07-30 11:07:53 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-14 20:09:45 +0200 |
| commit | e1c0e1a39c7ec1d5bb5f8493d4c76eadbe6abad1 (patch) | |
| tree | f5e8e333d346740cdfc70553e7b67f088e0b4b0c /arch/arm | |
| parent | ARM: prima2: pm: enable rtc alarm0 and alarm1 as wakeup source (diff) | |
| download | linux-e1c0e1a39c7ec1d5bb5f8493d4c76eadbe6abad1.tar.xz linux-e1c0e1a39c7ec1d5bb5f8493d4c76eadbe6abad1.zip | |
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>
Diffstat (limited to 'arch/arm')
| -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 = { .valid = suspend_valid_only_mem, }; -int __init sirfsoc_pm_init(void) -{ - suspend_set_ops(&sirfsoc_pm_ops); - return 0; -} - static const struct of_device_id pwrc_ids[] = { { .compatible = "sirf,prima2-pwrc" }, {} @@ -121,7 +115,6 @@ static int __init sirfsoc_of_pwrc_init(void) return 0; } -postcore_initcall(sirfsoc_of_pwrc_init); static const struct of_device_id memc_ids[] = { { .compatible = "sirf,prima2-memc" }, @@ -152,4 +145,11 @@ static int __init sirfsoc_memc_init(void) { return platform_driver_register(&sirfsoc_memc_driver); } -postcore_initcall(sirfsoc_memc_init); + +int __init sirfsoc_pm_init(void) +{ + sirfsoc_of_pwrc_init(); + sirfsoc_memc_init(); + suspend_set_ops(&sirfsoc_pm_ops); + return 0; +} |