aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-08-10 13:51:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 14:51:06 -0700
commitb4d1eb2ccecb76bce4c2125c5a3e77753fcfaeb0 (patch)
tree305103e5b12edfca76015222620dcd70fbcb757e /drivers/base
parentFix Firmware class name collision (diff)
downloadlinux-dev-b4d1eb2ccecb76bce4c2125c5a3e77753fcfaeb0.tar.xz
linux-dev-b4d1eb2ccecb76bce4c2125c5a3e77753fcfaeb0.zip
drivers/base/power/: make 2 functions static
suspend_device() and resume_device() can now become static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/power.h6
-rw-r--r--drivers/base/power/resume.c2
-rw-r--r--drivers/base/power/suspend.c2
3 files changed, 2 insertions, 8 deletions
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 8ba0830cbc03..49e64dbcce96 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 00fd84ae6e66..67948bac9938 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 26df9b231737..204517afb15e 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;