aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/common/sharpsl_pm.c8
-rw-r--r--arch/arm/mach-at91/pm.c4
-rw-r--r--arch/arm/mach-omap1/pm.c6
-rw-r--r--arch/arm/mach-omap2/pm.c6
-rw-r--r--arch/arm/mach-pnx4008/pm.c4
-rw-r--r--arch/arm/mach-pxa/pm.c4
-rw-r--r--arch/arm/mach-pxa/pxa25x.c2
-rw-r--r--arch/arm/mach-sa1100/pm.c6
-rw-r--r--arch/arm/plat-s3c24xx/pm.c6
-rw-r--r--arch/blackfin/mach-common/pm.c4
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pm.c4
-rw-r--r--arch/sh/boards/hp6xx/pm.c6
12 files changed, 30 insertions, 30 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index 85795a765a46..5bba5255b119 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -766,9 +766,9 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
766 info->battery_life = sharpsl_pm.battstat.mainbat_percent; 766 info->battery_life = sharpsl_pm.battstat.mainbat_percent;
767} 767}
768 768
769static struct pm_ops sharpsl_pm_ops = { 769static struct platform_suspend_ops sharpsl_pm_ops = {
770 .enter = corgi_pxa_pm_enter, 770 .enter = corgi_pxa_pm_enter,
771 .valid = pm_valid_only_mem, 771 .valid = suspend_valid_only_mem,
772}; 772};
773 773
774static int __init sharpsl_pm_probe(struct platform_device *pdev) 774static int __init sharpsl_pm_probe(struct platform_device *pdev)
@@ -800,7 +800,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
800 800
801 apm_get_power_status = sharpsl_apm_get_power_status; 801 apm_get_power_status = sharpsl_apm_get_power_status;
802 802
803 pm_set_ops(&sharpsl_pm_ops); 803 suspend_set_ops(&sharpsl_pm_ops);
804 804
805 mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250)); 805 mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
806 806
@@ -809,7 +809,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
809 809
810static int sharpsl_pm_remove(struct platform_device *pdev) 810static int sharpsl_pm_remove(struct platform_device *pdev)
811{ 811{
812 pm_set_ops(NULL); 812 suspend_set_ops(NULL);
813 813
814 device_remove_file(&pdev->dev, &dev_attr_battery_percentage); 814 device_remove_file(&pdev->dev, &dev_attr_battery_percentage);
815 device_remove_file(&pdev->dev, &dev_attr_battery_voltage); 815 device_remove_file(&pdev->dev, &dev_attr_battery_voltage);
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index c7c81c9f769c..98cb61482917 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -198,7 +198,7 @@ error:
198} 198}
199 199
200 200
201static struct pm_ops at91_pm_ops ={ 201static struct platform_suspend_ops at91_pm_ops ={
202 .valid = at91_pm_valid_state, 202 .valid = at91_pm_valid_state,
203 .set_target = at91_pm_set_target, 203 .set_target = at91_pm_set_target,
204 .enter = at91_pm_enter, 204 .enter = at91_pm_enter,
@@ -219,7 +219,7 @@ static int __init at91_pm_init(void)
219 /* Disable SDRAM low-power mode. Cannot be used with self-refresh. */ 219 /* Disable SDRAM low-power mode. Cannot be used with self-refresh. */
220 at91_sys_write(AT91_SDRAMC_LPR, 0); 220 at91_sys_write(AT91_SDRAMC_LPR, 0);
221 221
222 pm_set_ops(&at91_pm_ops); 222 suspend_set_ops(&at91_pm_ops);
223 223
224 return 0; 224 return 0;
225} 225}
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 1a27611096a9..8db38dd247a4 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -673,11 +673,11 @@ static struct irqaction omap_wakeup_irq = {
673 673
674 674
675 675
676static struct pm_ops omap_pm_ops ={ 676static struct platform_suspend_ops omap_pm_ops ={
677 .prepare = omap_pm_prepare, 677 .prepare = omap_pm_prepare,
678 .enter = omap_pm_enter, 678 .enter = omap_pm_enter,
679 .finish = omap_pm_finish, 679 .finish = omap_pm_finish,
680 .valid = pm_valid_only_mem, 680 .valid = suspend_valid_only_mem,
681}; 681};
682 682
683static int __init omap_pm_init(void) 683static int __init omap_pm_init(void)
@@ -734,7 +734,7 @@ static int __init omap_pm_init(void)
734 else if (cpu_is_omap16xx()) 734 else if (cpu_is_omap16xx())
735 omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3); 735 omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3);
736 736
737 pm_set_ops(&omap_pm_ops); 737 suspend_set_ops(&omap_pm_ops);
738 738
739#if defined(DEBUG) && defined(CONFIG_PROC_FS) 739#if defined(DEBUG) && defined(CONFIG_PROC_FS)
740 omap_pm_init_proc(); 740 omap_pm_init_proc();
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index f9fd3e3d0a59..9aaa7a2633e8 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -362,11 +362,11 @@ static int omap2_pm_finish(suspend_state_t state)
362 return 0; 362 return 0;
363} 363}
364 364
365static struct pm_ops omap_pm_ops = { 365static struct platform_suspend_ops omap_pm_ops = {
366 .prepare = omap2_pm_prepare, 366 .prepare = omap2_pm_prepare,
367 .enter = omap2_pm_enter, 367 .enter = omap2_pm_enter,
368 .finish = omap2_pm_finish, 368 .finish = omap2_pm_finish,
369 .valid = pm_valid_only_mem, 369 .valid = suspend_valid_only_mem,
370}; 370};
371 371
372int __init omap2_pm_init(void) 372int __init omap2_pm_init(void)
@@ -390,7 +390,7 @@ int __init omap2_pm_init(void)
390 omap2_sram_suspend = omap_sram_push(omap24xx_cpu_suspend, 390 omap2_sram_suspend = omap_sram_push(omap24xx_cpu_suspend,
391 omap24xx_cpu_suspend_sz); 391 omap24xx_cpu_suspend_sz);
392 392
393 pm_set_ops(&omap_pm_ops); 393 suspend_set_ops(&omap_pm_ops);
394 pm_idle = omap2_pm_idle; 394 pm_idle = omap2_pm_idle;
395 395
396 pmdomain_init(); 396 pmdomain_init();
diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
index 23307861f6d5..40116d254349 100644
--- a/arch/arm/mach-pnx4008/pm.c
+++ b/arch/arm/mach-pnx4008/pm.c
@@ -117,7 +117,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
117 (state == PM_SUSPEND_MEM); 117 (state == PM_SUSPEND_MEM);
118} 118}
119 119
120static struct pm_ops pnx4008_pm_ops = { 120static struct platform_suspend_ops pnx4008_pm_ops = {
121 .enter = pnx4008_pm_enter, 121 .enter = pnx4008_pm_enter,
122 .valid = pnx4008_pm_valid, 122 .valid = pnx4008_pm_valid,
123}; 123};
@@ -146,7 +146,7 @@ static int __init pnx4008_pm_init(void)
146 return -ENOMEM; 146 return -ENOMEM;
147 } 147 }
148 148
149 pm_set_ops(&pnx4008_pm_ops); 149 suspend_set_ops(&pnx4008_pm_ops);
150 return 0; 150 return 0;
151} 151}
152 152
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index b59a81a8e7d3..a941c71c7d06 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -86,7 +86,7 @@ static int pxa_pm_valid(suspend_state_t state)
86 return -EINVAL; 86 return -EINVAL;
87} 87}
88 88
89static struct pm_ops pxa_pm_ops = { 89static struct platform_suspend_ops pxa_pm_ops = {
90 .valid = pxa_pm_valid, 90 .valid = pxa_pm_valid,
91 .enter = pxa_pm_enter, 91 .enter = pxa_pm_enter,
92}; 92};
@@ -104,7 +104,7 @@ static int __init pxa_pm_init(void)
104 return -ENOMEM; 104 return -ENOMEM;
105 } 105 }
106 106
107 pm_set_ops(&pxa_pm_ops); 107 suspend_set_ops(&pxa_pm_ops);
108 return 0; 108 return 0;
109} 109}
110 110
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 08ccd8f6fbc0..dcd81f8d0833 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -215,7 +215,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state)
215 215
216static struct pxa_cpu_pm_fns pxa25x_cpu_pm_fns = { 216static struct pxa_cpu_pm_fns pxa25x_cpu_pm_fns = {
217 .save_size = SLEEP_SAVE_SIZE, 217 .save_size = SLEEP_SAVE_SIZE,
218 .valid = pm_valid_only_mem, 218 .valid = suspend_valid_only_mem,
219 .save = pxa25x_cpu_pm_save, 219 .save = pxa25x_cpu_pm_save,
220 .restore = pxa25x_cpu_pm_restore, 220 .restore = pxa25x_cpu_pm_restore,
221 .enter = pxa25x_cpu_pm_enter, 221 .enter = pxa25x_cpu_pm_enter,
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 01a37d3c0727..246c573e7252 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -122,14 +122,14 @@ unsigned long sleep_phys_sp(void *sp)
122 return virt_to_phys(sp); 122 return virt_to_phys(sp);
123} 123}
124 124
125static struct pm_ops sa11x0_pm_ops = { 125static struct platform_suspend_ops sa11x0_pm_ops = {
126 .enter = sa11x0_pm_enter, 126 .enter = sa11x0_pm_enter,
127 .valid = pm_valid_only_mem, 127 .valid = suspend_valid_only_mem,
128}; 128};
129 129
130static int __init sa11x0_pm_init(void) 130static int __init sa11x0_pm_init(void)
131{ 131{
132 pm_set_ops(&sa11x0_pm_ops); 132 suspend_set_ops(&sa11x0_pm_ops);
133 return 0; 133 return 0;
134} 134}
135 135
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
index eab1850616d8..4fdb3117744f 100644
--- a/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@ -612,9 +612,9 @@ static int s3c2410_pm_enter(suspend_state_t state)
612 return 0; 612 return 0;
613} 613}
614 614
615static struct pm_ops s3c2410_pm_ops = { 615static struct platform_suspend_ops s3c2410_pm_ops = {
616 .enter = s3c2410_pm_enter, 616 .enter = s3c2410_pm_enter,
617 .valid = pm_valid_only_mem, 617 .valid = suspend_valid_only_mem,
618}; 618};
619 619
620/* s3c2410_pm_init 620/* s3c2410_pm_init
@@ -628,6 +628,6 @@ int __init s3c2410_pm_init(void)
628{ 628{
629 printk("S3C2410 Power Management, (c) 2004 Simtec Electronics\n"); 629 printk("S3C2410 Power Management, (c) 2004 Simtec Electronics\n");
630 630
631 pm_set_ops(&s3c2410_pm_ops); 631 suspend_set_ops(&s3c2410_pm_ops);
632 return 0; 632 return 0;
633} 633}
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index bcb5a49e3520..6901891905cc 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -163,7 +163,7 @@ static int bfin_pm_valid(suspend_state_t state)
163 return (state == PM_SUSPEND_STANDBY); 163 return (state == PM_SUSPEND_STANDBY);
164} 164}
165 165
166struct pm_ops bfin_pm_ops = { 166struct platform_suspend_ops bfin_pm_ops = {
167 .prepare = bfin_pm_prepare, 167 .prepare = bfin_pm_prepare,
168 .enter = bfin_pm_enter, 168 .enter = bfin_pm_enter,
169 .finish = bfin_pm_finish, 169 .finish = bfin_pm_finish,
@@ -172,7 +172,7 @@ struct pm_ops bfin_pm_ops = {
172 172
173static int __init bfin_pm_init(void) 173static int __init bfin_pm_init(void)
174{ 174{
175 pm_set_ops(&bfin_pm_ops); 175 suspend_set_ops(&bfin_pm_ops);
176 return 0; 176 return 0;
177} 177}
178 178
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index 0809ec1d725c..44fb064c7a16 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -177,7 +177,7 @@ int mpc52xx_pm_finish(suspend_state_t state)
177 return 0; 177 return 0;
178} 178}
179 179
180static struct pm_ops mpc52xx_pm_ops = { 180static struct platform_suspend_ops mpc52xx_pm_ops = {
181 .valid = mpc52xx_pm_valid, 181 .valid = mpc52xx_pm_valid,
182 .prepare = mpc52xx_pm_prepare, 182 .prepare = mpc52xx_pm_prepare,
183 .enter = mpc52xx_pm_enter, 183 .enter = mpc52xx_pm_enter,
@@ -186,6 +186,6 @@ static struct pm_ops mpc52xx_pm_ops = {
186 186
187int __init mpc52xx_pm_init(void) 187int __init mpc52xx_pm_init(void)
188{ 188{
189 pm_set_ops(&mpc52xx_pm_ops); 189 suspend_set_ops(&mpc52xx_pm_ops);
190 return 0; 190 return 0;
191} 191}
diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c
index 8143d1b948e7..d22f6eac9cca 100644
--- a/arch/sh/boards/hp6xx/pm.c
+++ b/arch/sh/boards/hp6xx/pm.c
@@ -67,14 +67,14 @@ static int hp6x0_pm_enter(suspend_state_t state)
67 return 0; 67 return 0;
68} 68}
69 69
70static struct pm_ops hp6x0_pm_ops = { 70static struct platform_suspend_ops hp6x0_pm_ops = {
71 .enter = hp6x0_pm_enter, 71 .enter = hp6x0_pm_enter,
72 .valid = pm_valid_only_mem, 72 .valid = suspend_valid_only_mem,
73}; 73};
74 74
75static int __init hp6x0_pm_init(void) 75static int __init hp6x0_pm_init(void)
76{ 76{
77 pm_set_ops(&hp6x0_pm_ops); 77 suspend_set_ops(&hp6x0_pm_ops);
78 return 0; 78 return 0;
79} 79}
80 80