From: Adrian Bunk <[EMAIL PROTECTED]>
suspend_device() and resume_device() can now become static.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/base/power/power.h | 6 ------
drivers/base/power/resume.c | 2 +-
drivers/base/power/suspend.c | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 8ba0830..49e64db 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 00fd84a..67948ba 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 26df9b2..204517a 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;
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
