From: Adrian Bunk suspend_device() and resume_device() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- 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 -puN drivers/base/power/power.h~drivers-base-power-make-2-functions-static drivers/base/power/power.h --- a/drivers/base/power/power.h~drivers-base-power-make-2-functions-static +++ a/drivers/base/power/power.h @@ -55,12 +55,6 @@ extern void dpm_sysfs_remove(struct devi 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 -puN drivers/base/power/resume.c~drivers-base-power-make-2-functions-static drivers/base/power/resume.c --- a/drivers/base/power/resume.c~drivers-base-power-make-2-functions-static +++ a/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 -puN drivers/base/power/suspend.c~drivers-base-power-make-2-functions-static drivers/base/power/suspend.c --- a/drivers/base/power/suspend.c~drivers-base-power-make-2-functions-static +++ a/drivers/base/power/suspend.c @@ -54,7 +54,7 @@ suspend_device_dbg(struct device *dev, p * @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; _