PM: merge device power-management source files

This patch (as993) merges the suspend.c and resume.c files in
drivers/base/power into main.c, making some public symbols private.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern
2007-09-21 15:36:56 -04:00
committed by Greg Kroah-Hartman
parent 6d66f5cd26
commit cd59abfcc4
5 changed files with 343 additions and 394 deletions

View File

@@ -11,32 +11,11 @@ extern void device_shutdown(void);
* main.c
*/
/*
* Used to synchronize global power management operations.
*/
extern struct mutex dpm_mtx;
/*
* Used to serialize changes to the dpm_* lists.
*/
extern struct mutex dpm_list_mtx;
/*
* The PM lists.
*/
extern struct list_head dpm_active;
extern struct list_head dpm_off;
extern struct list_head dpm_off_irq;
static inline struct dev_pm_info * to_pm_info(struct list_head * entry)
{
return container_of(entry, struct dev_pm_info, entry);
}
extern struct list_head dpm_active; /* The active device list */
static inline struct device * to_device(struct list_head * entry)
{
return container_of(to_pm_info(entry), struct device, power);
return container_of(entry, struct device, power.entry);
}
extern int device_pm_add(struct device *);
@@ -49,13 +28,6 @@ extern void device_pm_remove(struct device *);
extern int dpm_sysfs_add(struct device *);
extern void dpm_sysfs_remove(struct device *);
/*
* resume.c
*/
extern void dpm_resume(void);
extern void dpm_power_up(void);
#else /* CONFIG_PM_SLEEP */