Commit 26398a70 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

PM: Rename struct pm_ops and related things

The name of 'struct pm_ops' suggests that it is related to the power
management in general, but in fact it is only related to suspend.   Moreover,
its name should indicate what this structure is used for, so it seems
reasonable to change it to 'struct platform_suspend_ops'.   In that case, the
name of the global variable of this type used by the PM core and the names of
related functions should be changed accordingly.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 95d9ffbe
...@@ -20,7 +20,7 @@ states. ...@@ -20,7 +20,7 @@ states.
/sys/power/disk controls the operating mode of the suspend-to-disk /sys/power/disk controls the operating mode of the suspend-to-disk
mechanism. Suspend-to-disk can be handled in several ways. We have a mechanism. Suspend-to-disk can be handled in several ways. We have a
few options for putting the system to sleep - using the platform driver few options for putting the system to sleep - using the platform driver
(e.g. ACPI or other pm_ops), powering off the system or rebooting the (e.g. ACPI or other suspend_ops), powering off the system or rebooting the
system (for testing). system (for testing).
Additionally, /sys/power/disk can be used to turn on one of the two testing Additionally, /sys/power/disk can be used to turn on one of the two testing
......
...@@ -766,9 +766,9 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) ...@@ -766,9 +766,9 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
info->battery_life = sharpsl_pm.battstat.mainbat_percent; info->battery_life = sharpsl_pm.battstat.mainbat_percent;
} }
static struct pm_ops sharpsl_pm_ops = { static struct platform_suspend_ops sharpsl_pm_ops = {
.enter = corgi_pxa_pm_enter, .enter = corgi_pxa_pm_enter,
.valid = pm_valid_only_mem, .valid = suspend_valid_only_mem,
}; };
static int __init sharpsl_pm_probe(struct platform_device *pdev) static int __init sharpsl_pm_probe(struct platform_device *pdev)
...@@ -800,7 +800,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) ...@@ -800,7 +800,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
apm_get_power_status = sharpsl_apm_get_power_status; apm_get_power_status = sharpsl_apm_get_power_status;
pm_set_ops(&sharpsl_pm_ops); suspend_set_ops(&sharpsl_pm_ops);
mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250)); mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
...@@ -809,7 +809,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) ...@@ -809,7 +809,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
static int sharpsl_pm_remove(struct platform_device *pdev) static int sharpsl_pm_remove(struct platform_device *pdev)
{ {
pm_set_ops(NULL); suspend_set_ops(NULL);
device_remove_file(&pdev->dev, &dev_attr_battery_percentage); device_remove_file(&pdev->dev, &dev_attr_battery_percentage);
device_remove_file(&pdev->dev, &dev_attr_battery_voltage); device_remove_file(&pdev->dev, &dev_attr_battery_voltage);
......
...@@ -198,7 +198,7 @@ static int at91_pm_enter(suspend_state_t state) ...@@ -198,7 +198,7 @@ static int at91_pm_enter(suspend_state_t state)
} }
static struct pm_ops at91_pm_ops ={ static struct platform_suspend_ops at91_pm_ops ={
.valid = at91_pm_valid_state, .valid = at91_pm_valid_state,
.set_target = at91_pm_set_target, .set_target = at91_pm_set_target,
.enter = at91_pm_enter, .enter = at91_pm_enter,
...@@ -219,7 +219,7 @@ static int __init at91_pm_init(void) ...@@ -219,7 +219,7 @@ static int __init at91_pm_init(void)
/* Disable SDRAM low-power mode. Cannot be used with self-refresh. */ /* Disable SDRAM low-power mode. Cannot be used with self-refresh. */
at91_sys_write(AT91_SDRAMC_LPR, 0); at91_sys_write(AT91_SDRAMC_LPR, 0);
pm_set_ops(&at91_pm_ops); suspend_set_ops(&at91_pm_ops);
return 0; return 0;
} }
......
...@@ -673,11 +673,11 @@ static struct irqaction omap_wakeup_irq = { ...@@ -673,11 +673,11 @@ static struct irqaction omap_wakeup_irq = {
static struct pm_ops omap_pm_ops ={ static struct platform_suspend_ops omap_pm_ops ={
.prepare = omap_pm_prepare, .prepare = omap_pm_prepare,
.enter = omap_pm_enter, .enter = omap_pm_enter,
.finish = omap_pm_finish, .finish = omap_pm_finish,
.valid = pm_valid_only_mem, .valid = suspend_valid_only_mem,
}; };
static int __init omap_pm_init(void) static int __init omap_pm_init(void)
...@@ -734,7 +734,7 @@ static int __init omap_pm_init(void) ...@@ -734,7 +734,7 @@ static int __init omap_pm_init(void)
else if (cpu_is_omap16xx()) else if (cpu_is_omap16xx())
omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3); omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3);
pm_set_ops(&omap_pm_ops); suspend_set_ops(&omap_pm_ops);
#if defined(DEBUG) && defined(CONFIG_PROC_FS) #if defined(DEBUG) && defined(CONFIG_PROC_FS)
omap_pm_init_proc(); omap_pm_init_proc();
......
...@@ -362,11 +362,11 @@ static int omap2_pm_finish(suspend_state_t state) ...@@ -362,11 +362,11 @@ static int omap2_pm_finish(suspend_state_t state)
return 0; return 0;
} }
static struct pm_ops omap_pm_ops = { static struct platform_suspend_ops omap_pm_ops = {
.prepare = omap2_pm_prepare, .prepare = omap2_pm_prepare,
.enter = omap2_pm_enter, .enter = omap2_pm_enter,
.finish = omap2_pm_finish, .finish = omap2_pm_finish,
.valid = pm_valid_only_mem, .valid = suspend_valid_only_mem,
}; };
int __init omap2_pm_init(void) int __init omap2_pm_init(void)
...@@ -390,7 +390,7 @@ int __init omap2_pm_init(void) ...@@ -390,7 +390,7 @@ int __init omap2_pm_init(void)
omap2_sram_suspend = omap_sram_push(omap24xx_cpu_suspend, omap2_sram_suspend = omap_sram_push(omap24xx_cpu_suspend,
omap24xx_cpu_suspend_sz); omap24xx_cpu_suspend_sz);
pm_set_ops(&omap_pm_ops); suspend_set_ops(&omap_pm_ops);
pm_idle = omap2_pm_idle; pm_idle = omap2_pm_idle;
pmdomain_init(); pmdomain_init();
......
...@@ -117,7 +117,7 @@ static int pnx4008_pm_valid(suspend_state_t state) ...@@ -117,7 +117,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
(state == PM_SUSPEND_MEM); (state == PM_SUSPEND_MEM);
} }
static struct pm_ops pnx4008_pm_ops = { static struct platform_suspend_ops pnx4008_pm_ops = {
.enter = pnx4008_pm_enter, .enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid, .valid = pnx4008_pm_valid,
}; };
...@@ -146,7 +146,7 @@ static int __init pnx4008_pm_init(void) ...@@ -146,7 +146,7 @@ static int __init pnx4008_pm_init(void)
return -ENOMEM; return -ENOMEM;
} }
pm_set_ops(&pnx4008_pm_ops); suspend_set_ops(&pnx4008_pm_ops);
return 0; return 0;
} }
......
...@@ -86,7 +86,7 @@ static int pxa_pm_valid(suspend_state_t state) ...@@ -86,7 +86,7 @@ static int pxa_pm_valid(suspend_state_t state)
return -EINVAL; return -EINVAL;
} }
static struct pm_ops pxa_pm_ops = { static struct platform_suspend_ops pxa_pm_ops = {
.valid = pxa_pm_valid, .valid = pxa_pm_valid,
.enter = pxa_pm_enter, .enter = pxa_pm_enter,
}; };
...@@ -104,7 +104,7 @@ static int __init pxa_pm_init(void) ...@@ -104,7 +104,7 @@ static int __init pxa_pm_init(void)
return -ENOMEM; return -ENOMEM;
} }
pm_set_ops(&pxa_pm_ops); suspend_set_ops(&pxa_pm_ops);
return 0; return 0;
} }
......
...@@ -215,7 +215,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state) ...@@ -215,7 +215,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state)
static struct pxa_cpu_pm_fns pxa25x_cpu_pm_fns = { static struct pxa_cpu_pm_fns pxa25x_cpu_pm_fns = {
.save_size = SLEEP_SAVE_SIZE, .save_size = SLEEP_SAVE_SIZE,
.valid = pm_valid_only_mem, .valid = suspend_valid_only_mem,
.save = pxa25x_cpu_pm_save, .save = pxa25x_cpu_pm_save,
.restore = pxa25x_cpu_pm_restore, .restore = pxa25x_cpu_pm_restore,
.enter = pxa25x_cpu_pm_enter, .enter = pxa25x_cpu_pm_enter,
......
...@@ -122,14 +122,14 @@ unsigned long sleep_phys_sp(void *sp) ...@@ -122,14 +122,14 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp); return virt_to_phys(sp);
} }
static struct pm_ops sa11x0_pm_ops = { static struct platform_suspend_ops sa11x0_pm_ops = {
.enter = sa11x0_pm_enter, .enter = sa11x0_pm_enter,
.valid = pm_valid_only_mem, .valid = suspend_valid_only_mem,
}; };
static int __init sa11x0_pm_init(void) static int __init sa11x0_pm_init(void)
{ {
pm_set_ops(&sa11x0_pm_ops); suspend_set_ops(&sa11x0_pm_ops);
return 0; return 0;
} }
......
...@@ -612,9 +612,9 @@ static int s3c2410_pm_enter(suspend_state_t state) ...@@ -612,9 +612,9 @@ static int s3c2410_pm_enter(suspend_state_t state)
return 0; return 0;
} }
static struct pm_ops s3c2410_pm_ops = { static struct platform_suspend_ops s3c2410_pm_ops = {
.enter = s3c2410_pm_enter, .enter = s3c2410_pm_enter,
.valid = pm_valid_only_mem, .valid = suspend_valid_only_mem,
}; };
/* s3c2410_pm_init /* s3c2410_pm_init
...@@ -628,6 +628,6 @@ int __init s3c2410_pm_init(void) ...@@ -628,6 +628,6 @@ int __init s3c2410_pm_init(void)
{ {
printk("S3C2410 Power Management, (c) 2004 Simtec Electronics\n"); printk("S3C2410 Power Management, (c) 2004 Simtec Electronics\n");
pm_set_ops(&s3c2410_pm_ops); suspend_set_ops(&s3c2410_pm_ops);
return 0; return 0;
} }
...@@ -163,7 +163,7 @@ static int bfin_pm_valid(suspend_state_t state) ...@@ -163,7 +163,7 @@ static int bfin_pm_valid(suspend_state_t state)
return (state == PM_SUSPEND_STANDBY); return (state == PM_SUSPEND_STANDBY);
} }
struct pm_ops bfin_pm_ops = { struct platform_suspend_ops bfin_pm_ops = {
.prepare = bfin_pm_prepare, .prepare = bfin_pm_prepare,
.enter = bfin_pm_enter, .enter = bfin_pm_enter,
.finish = bfin_pm_finish, .finish = bfin_pm_finish,
...@@ -172,7 +172,7 @@ struct pm_ops bfin_pm_ops = { ...@@ -172,7 +172,7 @@ struct pm_ops bfin_pm_ops = {
static int __init bfin_pm_init(void) static int __init bfin_pm_init(void)
{ {
pm_set_ops(&bfin_pm_ops); suspend_set_ops(&bfin_pm_ops);
return 0; return 0;
} }
......
...@@ -177,7 +177,7 @@ int mpc52xx_pm_finish(suspend_state_t state) ...@@ -177,7 +177,7 @@ int mpc52xx_pm_finish(suspend_state_t state)
return 0; return 0;
} }
static struct pm_ops mpc52xx_pm_ops = { static struct platform_suspend_ops mpc52xx_pm_ops = {
.valid = mpc52xx_pm_valid, .valid = mpc52xx_pm_valid,
.prepare = mpc52xx_pm_prepare, .prepare = mpc52xx_pm_prepare,
.enter = mpc52xx_pm_enter, .enter = mpc52xx_pm_enter,
...@@ -186,6 +186,6 @@ static struct pm_ops mpc52xx_pm_ops = { ...@@ -186,6 +186,6 @@ static struct pm_ops mpc52xx_pm_ops = {
int __init mpc52xx_pm_init(void) int __init mpc52xx_pm_init(void)
{ {
pm_set_ops(&mpc52xx_pm_ops); suspend_set_ops(&mpc52xx_pm_ops);
return 0; return 0;
} }
...@@ -67,14 +67,14 @@ static int hp6x0_pm_enter(suspend_state_t state) ...@@ -67,14 +67,14 @@ static int hp6x0_pm_enter(suspend_state_t state)
return 0; return 0;
} }
static struct pm_ops hp6x0_pm_ops = { static struct platform_suspend_ops hp6x0_pm_ops = {
.enter = hp6x0_pm_enter, .enter = hp6x0_pm_enter,
.valid = pm_valid_only_mem, .valid = suspend_valid_only_mem,
}; };
static int __init hp6x0_pm_init(void) static int __init hp6x0_pm_init(void)
{ {
pm_set_ops(&hp6x0_pm_ops); suspend_set_ops(&hp6x0_pm_ops);
return 0; return 0;
} }
......
...@@ -50,7 +50,7 @@ int acpi_sleep_prepare(u32 acpi_state) ...@@ -50,7 +50,7 @@ int acpi_sleep_prepare(u32 acpi_state)
} }
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
static struct pm_ops acpi_pm_ops; static struct platform_suspend_ops acpi_pm_ops;
extern void do_suspend_lowlevel(void); extern void do_suspend_lowlevel(void);
...@@ -203,7 +203,7 @@ static int acpi_pm_state_valid(suspend_state_t pm_state) ...@@ -203,7 +203,7 @@ static int acpi_pm_state_valid(suspend_state_t pm_state)
} }
} }
static struct pm_ops acpi_pm_ops = { static struct platform_suspend_ops acpi_pm_ops = {
.valid = acpi_pm_state_valid, .valid = acpi_pm_state_valid,
.set_target = acpi_pm_set_target, .set_target = acpi_pm_set_target,
.prepare = acpi_pm_prepare, .prepare = acpi_pm_prepare,
...@@ -417,7 +417,7 @@ int __init acpi_sleep_init(void) ...@@ -417,7 +417,7 @@ int __init acpi_sleep_init(void)
} }
} }
pm_set_ops(&acpi_pm_ops); suspend_set_ops(&acpi_pm_ops);
#endif #endif
#ifdef CONFIG_HIBERNATION #ifdef CONFIG_HIBERNATION
......
...@@ -27,16 +27,16 @@ typedef int __bitwise suspend_state_t; ...@@ -27,16 +27,16 @@ typedef int __bitwise suspend_state_t;
#define PM_SUSPEND_MAX ((__force suspend_state_t) 4) #define PM_SUSPEND_MAX ((__force suspend_state_t) 4)
/** /**
* struct pm_ops - Callbacks for managing platform dependent system sleep * struct platform_suspend_ops - Callbacks for managing platform dependent
* states. * system sleep states.
* *
* @valid: Callback to determine if given system sleep state is supported by * @valid: Callback to determine if given system sleep state is supported by
* the platform. * the platform.
* Valid (ie. supported) states are advertised in /sys/power/state. Note * Valid (ie. supported) states are advertised in /sys/power/state. Note
* that it still may be impossible to enter given system sleep state if the * that it still may be impossible to enter given system sleep state if the
* conditions aren't right. * conditions aren't right.
* There is the %pm_valid_only_mem function available that can be assigned * There is the %suspend_valid_only_mem function available that can be
* to this if the platform only supports mem sleep. * assigned to this if the platform only supports mem sleep.
* *
* @set_target: Tell the platform which system sleep state is going to be * @set_target: Tell the platform which system sleep state is going to be
* entered. * entered.
...@@ -73,7 +73,7 @@ typedef int __bitwise suspend_state_t; ...@@ -73,7 +73,7 @@ typedef int __bitwise suspend_state_t;
* that implement @prepare(). If implemented, it is always called after * that implement @prepare(). If implemented, it is always called after
* @enter() (even if @enter() fails). * @enter() (even if @enter() fails).
*/ */
struct pm_ops { struct platform_suspend_ops {
int (*valid)(suspend_state_t state); int (*valid)(suspend_state_t state);
int (*set_target)(suspend_state_t state); int (*set_target)(suspend_state_t state);
int (*prepare)(suspend_state_t state); int (*prepare)(suspend_state_t state);
...@@ -82,14 +82,14 @@ struct pm_ops { ...@@ -82,14 +82,14 @@ struct pm_ops {
}; };
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
extern struct pm_ops *pm_ops; extern struct platform_suspend_ops *suspend_ops;
/** /**
* pm_set_ops - set platform dependent power management ops * suspend_set_ops - set platform dependent suspend operations
* @pm_ops: The new power management operations to set. * @ops: The new suspend operations to set.
*/ */
extern void pm_set_ops(struct pm_ops *pm_ops); extern void suspend_set_ops(struct platform_suspend_ops *ops);
extern int pm_valid_only_mem(suspend_state_t state); extern int suspend_valid_only_mem(suspend_state_t state);
/** /**
* arch_suspend_disable_irqs - disable IRQs for suspend * arch_suspend_disable_irqs - disable IRQs for suspend
...@@ -113,7 +113,7 @@ extern int pm_suspend(suspend_state_t state); ...@@ -113,7 +113,7 @@ extern int pm_suspend(suspend_state_t state);
#else /* !CONFIG_SUSPEND */ #else /* !CONFIG_SUSPEND */
#define suspend_valid_only_mem NULL #define suspend_valid_only_mem NULL
static inline void pm_set_ops(struct pm_ops *pm_ops) {} static inline void suspend_set_ops(struct platform_suspend_ops *ops) {}
static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; } static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
#endif /* !CONFIG_SUSPEND */ #endif /* !CONFIG_SUSPEND */
......
...@@ -32,28 +32,28 @@ DEFINE_MUTEX(pm_mutex); ...@@ -32,28 +32,28 @@ DEFINE_MUTEX(pm_mutex);
/* This is just an arbitrary number */ /* This is just an arbitrary number */
#define FREE_PAGE_NUMBER (100) #define FREE_PAGE_NUMBER (100)
struct pm_ops *pm_ops; struct platform_suspend_ops *suspend_ops;
/** /**
* pm_set_ops - Set the global power method table. * suspend_set_ops - Set the global suspend method table.
* @ops: Pointer to ops structure. * @ops: Pointer to ops structure.
*/ */
void pm_set_ops(struct pm_ops * ops) void suspend_set_ops(struct platform_suspend_ops *ops)
{ {
mutex_lock(&pm_mutex); mutex_lock(&pm_mutex);
pm_ops = ops; suspend_ops = ops;
mutex_unlock(&pm_mutex); mutex_unlock(&pm_mutex);
} }
/** /**
* pm_valid_only_mem - generic memory-only valid callback * suspend_valid_only_mem - generic memory-only valid callback
* *
* pm_ops drivers that implement mem suspend only and only need * Platform drivers that implement mem suspend only and only need
* to check for that in their .valid callback can use this instead * to check for that in their .valid callback can use this instead
* of rolling their own .valid callback. * of rolling their own .valid callback.
*/ */
int pm_valid_only_mem(suspend_state_t state) int suspend_valid_only_mem(suspend_state_t state)
{ {
return state == PM_SUSPEND_MEM; return state == PM_SUSPEND_MEM;
} }
...@@ -61,8 +61,8 @@ int pm_valid_only_mem(suspend_state_t state) ...@@ -61,8 +61,8 @@ int pm_valid_only_mem(suspend_state_t state)
static inline void pm_finish(suspend_state_t state) static inline void pm_finish(suspend_state_t state)
{ {
if (pm_ops->finish) if (suspend_ops->finish)
pm_ops->finish(state); suspend_ops->finish(state);
} }
/** /**
...@@ -76,7 +76,7 @@ static int suspend_prepare(void) ...@@ -76,7 +76,7 @@ static int suspend_prepare(void)
int error; int error;
unsigned int free_pages; unsigned int free_pages;
if (!pm_ops || !pm_ops->enter) if (!suspend_ops || !suspend_ops->enter)
return -EPERM; return -EPERM;
error = pm_notifier_call_chain(PM_SUSPEND_PREPARE); error = pm_notifier_call_chain(PM_SUSPEND_PREPARE);
...@@ -139,7 +139,7 @@ static int suspend_enter(suspend_state_t state) ...@@ -139,7 +139,7 @@ static int suspend_enter(suspend_state_t state)
printk(KERN_ERR "Some devices failed to power down\n"); printk(KERN_ERR "Some devices failed to power down\n");
goto Done; goto Done;
} }
error = pm_ops->enter(state); error = suspend_ops->enter(state);
device_power_up(); device_power_up();
Done: Done:
arch_suspend_enable_irqs(); arch_suspend_enable_irqs();
...@@ -156,11 +156,11 @@ int suspend_devices_and_enter(suspend_state_t state) ...@@ -156,11 +156,11 @@ int suspend_devices_and_enter(suspend_state_t state)
{ {
int error; int error;
if (!pm_ops) if (!suspend_ops)
return -ENOSYS; return -ENOSYS;
if (pm_ops->set_target) { if (suspend_ops->set_target) {
error = pm_ops->set_target(state); error = suspend_ops->set_target(state);
if (error) if (error)
return error; return error;
} }
...@@ -170,8 +170,8 @@ int suspend_devices_and_enter(suspend_state_t state) ...@@ -170,8 +170,8 @@ int suspend_devices_and_enter(suspend_state_t state)
printk(KERN_ERR "Some devices failed to suspend\n"); printk(KERN_ERR "Some devices failed to suspend\n");
goto Resume_console; goto Resume_console;
} }
if (pm_ops->prepare) { if (suspend_ops->prepare) {
error = pm_ops->prepare(state); error = suspend_ops->prepare(state);
if (error) if (error)
goto Resume_devices; goto Resume_devices;
} }
...@@ -214,7 +214,7 @@ static inline int valid_state(suspend_state_t state) ...@@ -214,7 +214,7 @@ static inline int valid_state(suspend_state_t state)
/* All states need lowlevel support and need to be valid /* All states need lowlevel support and need to be valid
* to the lowlevel implementation, no valid callback * to the lowlevel implementation, no valid callback
* implies that none are valid. */ * implies that none are valid. */
if (!pm_ops || !pm_ops->valid || !pm_ops->valid(state)) if (!suspend_ops || !suspend_ops->valid || !suspend_ops->valid(state))
return 0; return 0;
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment