Skip to content

Commit

Permalink
ARM: prima2: pm: drop redundant postcore_initcall
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Barry Song <[email protected]>
Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
21cnbao authored and olofj committed Aug 14, 2013
1 parent fe74f78 commit e1c0e1a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions arch/arm/mach-prima2/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
{}
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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;
}

0 comments on commit e1c0e1a

Please sign in to comment.