From: Adrian Bunk Date: Fri, 10 Aug 2007 20:51:09 +0000 (-0700) Subject: drivers/base/power/: make 2 functions static X-Git-Tag: v2.6.24-rc1~1394^2~41 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d1eb2ccecb76bce4c2125c5a3e77753fcfaeb0;p=linux-2.6 drivers/base/power/: make 2 functions static suspend_device() and resume_device() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index 8ba0830cbc..49e64dbcce 100644 --- a/drivers/base/power/power.h +++ b/drivers/base/power/power.h @@ -55,12 +55,6 @@ extern void dpm_sysfs_remove(struct device *); extern void dpm_resume(void); extern void dpm_power_up(void); -extern int resume_device(struct device *); - -/* - * suspend.c - */ -extern int suspend_device(struct device *, pm_message_t); #else /* CONFIG_PM_SLEEP */ diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c index 00fd84ae6e..67948bac99 100644 --- a/drivers/base/power/resume.c +++ b/drivers/base/power/resume.c @@ -20,7 +20,7 @@ * */ -int resume_device(struct device * dev) +static int resume_device(struct device * dev) { int error = 0; diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index 26df9b2317..204517afb1 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c @@ -54,7 +54,7 @@ suspend_device_dbg(struct device *dev, pm_message_t state, char *info) * @state: Power state device is entering. */ -int suspend_device(struct device * dev, pm_message_t state) +static int suspend_device(struct device * dev, pm_message_t state) { int error = 0;