summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki2012-08-07 01:15:02 +0200
committerRafael J. Wysocki2012-09-04 01:44:58 +0200
commita62595d359ba8ca0f25b93c06eab84ba97ca516f (patch)
treebd6ec8884fa3bcbf7f22ac77d55d7a13084a51e7
parentARM: shmobile: Move r8a7779's PM domain objects to a table (diff)
downloadkernel-qcow2-linux-a62595d359ba8ca0f25b93c06eab84ba97ca516f.tar.gz
kernel-qcow2-linux-a62595d359ba8ca0f25b93c06eab84ba97ca516f.tar.xz
kernel-qcow2-linux-a62595d359ba8ca0f25b93c06eab84ba97ca516f.zip
ARM: shmobile: Make rmobile_init_pm_domain() static
Since rmobile_init_pm_domain() is not called anywhere outside of arch/arm/mach-shmobile/pm-rmobile.c any more, it can be made static and its header may be removed from pm-rmobile.h. Modify the code accordingly. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Magnus Damm <damm@opensource.se>
-rw-r--r--arch/arm/mach-shmobile/include/mach/pm-rmobile.h2
-rw-r--r--arch/arm/mach-shmobile/pm-rmobile.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/pm-rmobile.h b/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
index 4c264c74760f..7fd9ad1fefe4 100644
--- a/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
+++ b/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
@@ -30,12 +30,10 @@ struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d)
}
#ifdef CONFIG_PM
-extern void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd);
extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num);
extern void rmobile_add_device_to_domain(const char *domain_name,
struct platform_device *pdev);
#else
-#define rmobile_init_pm_domain(pd) do { } while (0)
#define rmobile_init_domains(domains, num) do { } while (0)
#define rmobile_add_device_to_domain(name, pdev) do { } while (0)
#endif /* CONFIG_PM */
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index 4b6f2ea3169f..63f35665df31 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -134,7 +134,7 @@ static int rmobile_pd_start_dev(struct device *dev)
return ret;
}
-void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
+static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
{
struct generic_pm_domain *genpd = &rmobile_pd->genpd;
struct dev_power_governor *gov = rmobile_pd->gov;