diff options
Diffstat (limited to 'drivers')
66 files changed, 66 insertions, 66 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 5c01f747571b..d41d7f018549 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -4162,7 +4162,7 @@ static int floppy_resume(struct device *dev) | |||
4162 | return 0; | 4162 | return 0; |
4163 | } | 4163 | } |
4164 | 4164 | ||
4165 | static struct dev_pm_ops floppy_pm_ops = { | 4165 | static const struct dev_pm_ops floppy_pm_ops = { |
4166 | .resume = floppy_resume, | 4166 | .resume = floppy_resume, |
4167 | .restore = floppy_resume, | 4167 | .restore = floppy_resume, |
4168 | }; | 4168 | }; |
diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c index b8a5d654d3d0..fe62bd0e17b7 100644 --- a/drivers/char/hvc_iucv.c +++ b/drivers/char/hvc_iucv.c | |||
@@ -931,7 +931,7 @@ static struct hv_ops hvc_iucv_ops = { | |||
931 | }; | 931 | }; |
932 | 932 | ||
933 | /* Suspend / resume device operations */ | 933 | /* Suspend / resume device operations */ |
934 | static struct dev_pm_ops hvc_iucv_pm_ops = { | 934 | static const struct dev_pm_ops hvc_iucv_pm_ops = { |
935 | .freeze = hvc_iucv_pm_freeze, | 935 | .freeze = hvc_iucv_pm_freeze, |
936 | .thaw = hvc_iucv_pm_restore_thaw, | 936 | .thaw = hvc_iucv_pm_restore_thaw, |
937 | .restore = hvc_iucv_pm_restore_thaw, | 937 | .restore = hvc_iucv_pm_restore_thaw, |
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index c52ac9efd0bf..f15112569c1d 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
@@ -1188,7 +1188,7 @@ static int at_dma_resume_noirq(struct device *dev) | |||
1188 | return 0; | 1188 | return 0; |
1189 | } | 1189 | } |
1190 | 1190 | ||
1191 | static struct dev_pm_ops at_dma_dev_pm_ops = { | 1191 | static const struct dev_pm_ops at_dma_dev_pm_ops = { |
1192 | .suspend_noirq = at_dma_suspend_noirq, | 1192 | .suspend_noirq = at_dma_suspend_noirq, |
1193 | .resume_noirq = at_dma_resume_noirq, | 1193 | .resume_noirq = at_dma_resume_noirq, |
1194 | }; | 1194 | }; |
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 2eea823516a7..285bed0fe17b 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c | |||
@@ -1427,7 +1427,7 @@ static int dw_resume_noirq(struct device *dev) | |||
1427 | return 0; | 1427 | return 0; |
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | static struct dev_pm_ops dw_dev_pm_ops = { | 1430 | static const struct dev_pm_ops dw_dev_pm_ops = { |
1431 | .suspend_noirq = dw_suspend_noirq, | 1431 | .suspend_noirq = dw_suspend_noirq, |
1432 | .resume_noirq = dw_resume_noirq, | 1432 | .resume_noirq = dw_resume_noirq, |
1433 | }; | 1433 | }; |
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c index fb6bb64e8861..3ebc61067e54 100644 --- a/drivers/dma/txx9dmac.c +++ b/drivers/dma/txx9dmac.c | |||
@@ -1313,7 +1313,7 @@ static int txx9dmac_resume_noirq(struct device *dev) | |||
1313 | 1313 | ||
1314 | } | 1314 | } |
1315 | 1315 | ||
1316 | static struct dev_pm_ops txx9dmac_dev_pm_ops = { | 1316 | static const struct dev_pm_ops txx9dmac_dev_pm_ops = { |
1317 | .suspend_noirq = txx9dmac_suspend_noirq, | 1317 | .suspend_noirq = txx9dmac_suspend_noirq, |
1318 | .resume_noirq = txx9dmac_resume_noirq, | 1318 | .resume_noirq = txx9dmac_resume_noirq, |
1319 | }; | 1319 | }; |
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 7ea6a8f66056..c1605b528e8f 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -518,7 +518,7 @@ static int applesmc_pm_restore(struct device *dev) | |||
518 | return applesmc_pm_resume(dev); | 518 | return applesmc_pm_resume(dev); |
519 | } | 519 | } |
520 | 520 | ||
521 | static struct dev_pm_ops applesmc_pm_ops = { | 521 | static const struct dev_pm_ops applesmc_pm_ops = { |
522 | .resume = applesmc_pm_resume, | 522 | .resume = applesmc_pm_resume, |
523 | .restore = applesmc_pm_restore, | 523 | .restore = applesmc_pm_restore, |
524 | }; | 524 | }; |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 049555777f67..7647a20523a0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -1155,7 +1155,7 @@ static int i2c_pxa_resume_noirq(struct device *dev) | |||
1155 | return 0; | 1155 | return 0; |
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | static struct dev_pm_ops i2c_pxa_dev_pm_ops = { | 1158 | static const struct dev_pm_ops i2c_pxa_dev_pm_ops = { |
1159 | .suspend_noirq = i2c_pxa_suspend_noirq, | 1159 | .suspend_noirq = i2c_pxa_suspend_noirq, |
1160 | .resume_noirq = i2c_pxa_resume_noirq, | 1160 | .resume_noirq = i2c_pxa_resume_noirq, |
1161 | }; | 1161 | }; |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 96aafb91b69a..1d8c98613fa0 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -967,7 +967,7 @@ static int s3c24xx_i2c_resume(struct device *dev) | |||
967 | return 0; | 967 | return 0; |
968 | } | 968 | } |
969 | 969 | ||
970 | static struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { | 970 | static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { |
971 | .suspend_noirq = s3c24xx_i2c_suspend_noirq, | 971 | .suspend_noirq = s3c24xx_i2c_suspend_noirq, |
972 | .resume = s3c24xx_i2c_resume, | 972 | .resume = s3c24xx_i2c_resume, |
973 | }; | 973 | }; |
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 86a9d4e81472..ccc46418ef7f 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c | |||
@@ -647,7 +647,7 @@ static int sh_mobile_i2c_runtime_nop(struct device *dev) | |||
647 | return 0; | 647 | return 0; |
648 | } | 648 | } |
649 | 649 | ||
650 | static struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = { | 650 | static const struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = { |
651 | .runtime_suspend = sh_mobile_i2c_runtime_nop, | 651 | .runtime_suspend = sh_mobile_i2c_runtime_nop, |
652 | .runtime_resume = sh_mobile_i2c_runtime_nop, | 652 | .runtime_resume = sh_mobile_i2c_runtime_nop, |
653 | }; | 653 | }; |
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index d48c808d5928..1edb596d927b 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c | |||
@@ -319,7 +319,7 @@ static int adp5588_resume(struct device *dev) | |||
319 | return 0; | 319 | return 0; |
320 | } | 320 | } |
321 | 321 | ||
322 | static struct dev_pm_ops adp5588_dev_pm_ops = { | 322 | static const struct dev_pm_ops adp5588_dev_pm_ops = { |
323 | .suspend = adp5588_suspend, | 323 | .suspend = adp5588_suspend, |
324 | .resume = adp5588_resume, | 324 | .resume = adp5588_resume, |
325 | }; | 325 | }; |
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index 076111fc72d2..8e9380bfed40 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/drivers/input/keyboard/sh_keysc.c | |||
@@ -295,7 +295,7 @@ static int sh_keysc_resume(struct device *dev) | |||
295 | return 0; | 295 | return 0; |
296 | } | 296 | } |
297 | 297 | ||
298 | static struct dev_pm_ops sh_keysc_dev_pm_ops = { | 298 | static const struct dev_pm_ops sh_keysc_dev_pm_ops = { |
299 | .suspend = sh_keysc_suspend, | 299 | .suspend = sh_keysc_suspend, |
300 | .resume = sh_keysc_resume, | 300 | .resume = sh_keysc_resume, |
301 | }; | 301 | }; |
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c index 690f3fafa03b..61d10177fa83 100644 --- a/drivers/input/misc/bfin_rotary.c +++ b/drivers/input/misc/bfin_rotary.c | |||
@@ -247,7 +247,7 @@ static int bfin_rotary_resume(struct device *dev) | |||
247 | return 0; | 247 | return 0; |
248 | } | 248 | } |
249 | 249 | ||
250 | static struct dev_pm_ops bfin_rotary_pm_ops = { | 250 | static const struct dev_pm_ops bfin_rotary_pm_ops = { |
251 | .suspend = bfin_rotary_suspend, | 251 | .suspend = bfin_rotary_suspend, |
252 | .resume = bfin_rotary_resume, | 252 | .resume = bfin_rotary_resume, |
253 | }; | 253 | }; |
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c index 21cb755a54fb..ea4e1fd12651 100644 --- a/drivers/input/misc/pcspkr.c +++ b/drivers/input/misc/pcspkr.c | |||
@@ -127,7 +127,7 @@ static void pcspkr_shutdown(struct platform_device *dev) | |||
127 | pcspkr_event(NULL, EV_SND, SND_BELL, 0); | 127 | pcspkr_event(NULL, EV_SND, SND_BELL, 0); |
128 | } | 128 | } |
129 | 129 | ||
130 | static struct dev_pm_ops pcspkr_pm_ops = { | 130 | static const struct dev_pm_ops pcspkr_pm_ops = { |
131 | .suspend = pcspkr_suspend, | 131 | .suspend = pcspkr_suspend, |
132 | }; | 132 | }; |
133 | 133 | ||
diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c index 67fcd33595de..b79097e3028a 100644 --- a/drivers/input/touchscreen/pcap_ts.c +++ b/drivers/input/touchscreen/pcap_ts.c | |||
@@ -233,7 +233,7 @@ static int pcap_ts_resume(struct device *dev) | |||
233 | return 0; | 233 | return 0; |
234 | } | 234 | } |
235 | 235 | ||
236 | static struct dev_pm_ops pcap_ts_pm_ops = { | 236 | static const struct dev_pm_ops pcap_ts_pm_ops = { |
237 | .suspend = pcap_ts_suspend, | 237 | .suspend = pcap_ts_suspend, |
238 | .resume = pcap_ts_resume, | 238 | .resume = pcap_ts_resume, |
239 | }; | 239 | }; |
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index 12a1b3d7132d..c3916a42668e 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c | |||
@@ -2127,7 +2127,7 @@ vpfe_resume(struct device *dev) | |||
2127 | return -1; | 2127 | return -1; |
2128 | } | 2128 | } |
2129 | 2129 | ||
2130 | static struct dev_pm_ops vpfe_dev_pm_ops = { | 2130 | static const struct dev_pm_ops vpfe_dev_pm_ops = { |
2131 | .suspend = vpfe_suspend, | 2131 | .suspend = vpfe_suspend, |
2132 | .resume = vpfe_resume, | 2132 | .resume = vpfe_resume, |
2133 | }; | 2133 | }; |
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c index d947ee5e4eb4..78130721f578 100644 --- a/drivers/media/video/davinci/vpif_capture.c +++ b/drivers/media/video/davinci/vpif_capture.c | |||
@@ -2107,7 +2107,7 @@ vpif_resume(struct device *dev) | |||
2107 | return -1; | 2107 | return -1; |
2108 | } | 2108 | } |
2109 | 2109 | ||
2110 | static struct dev_pm_ops vpif_dev_pm_ops = { | 2110 | static const struct dev_pm_ops vpif_dev_pm_ops = { |
2111 | .suspend = vpif_suspend, | 2111 | .suspend = vpif_suspend, |
2112 | .resume = vpif_resume, | 2112 | .resume = vpif_resume, |
2113 | }; | 2113 | }; |
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index a4f3472d4db8..961e4484d721 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c | |||
@@ -1825,7 +1825,7 @@ static int sh_mobile_ceu_runtime_nop(struct device *dev) | |||
1825 | return 0; | 1825 | return 0; |
1826 | } | 1826 | } |
1827 | 1827 | ||
1828 | static struct dev_pm_ops sh_mobile_ceu_dev_pm_ops = { | 1828 | static const struct dev_pm_ops sh_mobile_ceu_dev_pm_ops = { |
1829 | .runtime_suspend = sh_mobile_ceu_runtime_nop, | 1829 | .runtime_suspend = sh_mobile_ceu_runtime_nop, |
1830 | .runtime_resume = sh_mobile_ceu_runtime_nop, | 1830 | .runtime_resume = sh_mobile_ceu_runtime_nop, |
1831 | }; | 1831 | }; |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index bb47ff465c04..0d783f3e79ed 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -828,7 +828,7 @@ static int pxamci_resume(struct device *dev) | |||
828 | return ret; | 828 | return ret; |
829 | } | 829 | } |
830 | 830 | ||
831 | static struct dev_pm_ops pxamci_pm_ops = { | 831 | static const struct dev_pm_ops pxamci_pm_ops = { |
832 | .suspend = pxamci_suspend, | 832 | .suspend = pxamci_suspend, |
833 | .resume = pxamci_resume, | 833 | .resume = pxamci_resume, |
834 | }; | 834 | }; |
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 941a4d35ef8d..ec15f1bbf8b9 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
@@ -1892,7 +1892,7 @@ static int s3cmci_resume(struct device *dev) | |||
1892 | return mmc_resume_host(mmc); | 1892 | return mmc_resume_host(mmc); |
1893 | } | 1893 | } |
1894 | 1894 | ||
1895 | static struct dev_pm_ops s3cmci_pm = { | 1895 | static const struct dev_pm_ops s3cmci_pm = { |
1896 | .suspend = s3cmci_suspend, | 1896 | .suspend = s3cmci_suspend, |
1897 | .resume = s3cmci_resume, | 1897 | .resume = s3cmci_resume, |
1898 | }; | 1898 | }; |
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index 7c302d55910e..66123419f65d 100644 --- a/drivers/mtd/nand/nomadik_nand.c +++ b/drivers/mtd/nand/nomadik_nand.c | |||
@@ -216,7 +216,7 @@ static int nomadik_nand_resume(struct device *dev) | |||
216 | return 0; | 216 | return 0; |
217 | } | 217 | } |
218 | 218 | ||
219 | static struct dev_pm_ops nomadik_nand_pm_ops = { | 219 | static const struct dev_pm_ops nomadik_nand_pm_ops = { |
220 | .suspend = nomadik_nand_suspend, | 220 | .suspend = nomadik_nand_suspend, |
221 | .resume = nomadik_nand_resume, | 221 | .resume = nomadik_nand_resume, |
222 | }; | 222 | }; |
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 78b7167a8ce3..39db0e96815d 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -837,7 +837,7 @@ static int vortex_resume(struct device *dev) | |||
837 | return 0; | 837 | return 0; |
838 | } | 838 | } |
839 | 839 | ||
840 | static struct dev_pm_ops vortex_pm_ops = { | 840 | static const struct dev_pm_ops vortex_pm_ops = { |
841 | .suspend = vortex_suspend, | 841 | .suspend = vortex_suspend, |
842 | .resume = vortex_resume, | 842 | .resume = vortex_resume, |
843 | .freeze = vortex_suspend, | 843 | .freeze = vortex_suspend, |
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 0cbe3c0e7c06..b37730065688 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
@@ -1646,7 +1646,7 @@ dm9000_drv_resume(struct device *dev) | |||
1646 | return 0; | 1646 | return 0; |
1647 | } | 1647 | } |
1648 | 1648 | ||
1649 | static struct dev_pm_ops dm9000_drv_pm_ops = { | 1649 | static const struct dev_pm_ops dm9000_drv_pm_ops = { |
1650 | .suspend = dm9000_drv_suspend, | 1650 | .suspend = dm9000_drv_suspend, |
1651 | .resume = dm9000_drv_resume, | 1651 | .resume = dm9000_drv_resume, |
1652 | }; | 1652 | }; |
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index acfc5a3aa490..60f96c468a24 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -4859,7 +4859,7 @@ out: | |||
4859 | return 0; | 4859 | return 0; |
4860 | } | 4860 | } |
4861 | 4861 | ||
4862 | static struct dev_pm_ops rtl8169_pm_ops = { | 4862 | static const struct dev_pm_ops rtl8169_pm_ops = { |
4863 | .suspend = rtl8169_suspend, | 4863 | .suspend = rtl8169_suspend, |
4864 | .resume = rtl8169_resume, | 4864 | .resume = rtl8169_resume, |
4865 | .freeze = rtl8169_suspend, | 4865 | .freeze = rtl8169_suspend, |
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 20d6095cf411..494cd91ea39c 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -2154,7 +2154,7 @@ static int smsc911x_resume(struct device *dev) | |||
2154 | return (to == 0) ? -EIO : 0; | 2154 | return (to == 0) ? -EIO : 0; |
2155 | } | 2155 | } |
2156 | 2156 | ||
2157 | static struct dev_pm_ops smsc911x_pm_ops = { | 2157 | static const struct dev_pm_ops smsc911x_pm_ops = { |
2158 | .suspend = smsc911x_suspend, | 2158 | .suspend = smsc911x_suspend, |
2159 | .resume = smsc911x_resume, | 2159 | .resume = smsc911x_resume, |
2160 | }; | 2160 | }; |
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 1ceb9d0f8b97..9cc438282d77 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
@@ -2689,7 +2689,7 @@ vmxnet3_resume(struct device *device) | |||
2689 | return 0; | 2689 | return 0; |
2690 | } | 2690 | } |
2691 | 2691 | ||
2692 | static struct dev_pm_ops vmxnet3_pm_ops = { | 2692 | static const struct dev_pm_ops vmxnet3_pm_ops = { |
2693 | .suspend = vmxnet3_suspend, | 2693 | .suspend = vmxnet3_suspend, |
2694 | .resume = vmxnet3_resume, | 2694 | .resume = vmxnet3_resume, |
2695 | }; | 2695 | }; |
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index ce52ea34fee5..a49452e2aed9 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
@@ -43,7 +43,7 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev) | |||
43 | } | 43 | } |
44 | 44 | ||
45 | #ifdef CONFIG_PM | 45 | #ifdef CONFIG_PM |
46 | static struct dev_pm_ops pcie_portdrv_pm_ops = { | 46 | static const struct dev_pm_ops pcie_portdrv_pm_ops = { |
47 | .suspend = pcie_port_device_suspend, | 47 | .suspend = pcie_port_device_suspend, |
48 | .resume = pcie_port_device_resume, | 48 | .resume = pcie_port_device_resume, |
49 | .freeze = pcie_port_device_suspend, | 49 | .freeze = pcie_port_device_suspend, |
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index da346eb7e77e..3aabf1e37988 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
@@ -336,7 +336,7 @@ static int pxa2xx_drv_pcmcia_resume(struct device *dev) | |||
336 | return pcmcia_socket_dev_resume(dev); | 336 | return pcmcia_socket_dev_resume(dev); |
337 | } | 337 | } |
338 | 338 | ||
339 | static struct dev_pm_ops pxa2xx_drv_pcmcia_pm_ops = { | 339 | static const struct dev_pm_ops pxa2xx_drv_pcmcia_pm_ops = { |
340 | .suspend = pxa2xx_drv_pcmcia_suspend, | 340 | .suspend = pxa2xx_drv_pcmcia_suspend, |
341 | .resume = pxa2xx_drv_pcmcia_resume, | 341 | .resume = pxa2xx_drv_pcmcia_resume, |
342 | }; | 342 | }; |
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index fe02cfd4b5e9..e4d12acdd525 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
@@ -1330,7 +1330,7 @@ static int yenta_dev_resume(struct device *dev) | |||
1330 | return 0; | 1330 | return 0; |
1331 | } | 1331 | } |
1332 | 1332 | ||
1333 | static struct dev_pm_ops yenta_pm_ops = { | 1333 | static const struct dev_pm_ops yenta_pm_ops = { |
1334 | .suspend_noirq = yenta_dev_suspend_noirq, | 1334 | .suspend_noirq = yenta_dev_suspend_noirq, |
1335 | .resume_noirq = yenta_dev_resume_noirq, | 1335 | .resume_noirq = yenta_dev_resume_noirq, |
1336 | .resume = yenta_dev_resume, | 1336 | .resume = yenta_dev_resume, |
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index ab64522aaa64..be27aa47e810 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c | |||
@@ -460,7 +460,7 @@ static int acerhdf_remove(struct platform_device *device) | |||
460 | return 0; | 460 | return 0; |
461 | } | 461 | } |
462 | 462 | ||
463 | static struct dev_pm_ops acerhdf_pm_ops = { | 463 | static const struct dev_pm_ops acerhdf_pm_ops = { |
464 | .suspend = acerhdf_suspend, | 464 | .suspend = acerhdf_suspend, |
465 | .freeze = acerhdf_suspend, | 465 | .freeze = acerhdf_suspend, |
466 | }; | 466 | }; |
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 4226e5352738..e647a856b9bf 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
@@ -154,7 +154,7 @@ static struct eeepc_hotk *ehotk; | |||
154 | static int eeepc_hotk_thaw(struct device *device); | 154 | static int eeepc_hotk_thaw(struct device *device); |
155 | static int eeepc_hotk_restore(struct device *device); | 155 | static int eeepc_hotk_restore(struct device *device); |
156 | 156 | ||
157 | static struct dev_pm_ops eeepc_pm_ops = { | 157 | static const struct dev_pm_ops eeepc_pm_ops = { |
158 | .thaw = eeepc_hotk_thaw, | 158 | .thaw = eeepc_hotk_thaw, |
159 | .restore = eeepc_hotk_restore, | 159 | .restore = eeepc_hotk_restore, |
160 | }; | 160 | }; |
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index c2842171cec6..f00a71c58e69 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c | |||
@@ -94,7 +94,7 @@ static struct rfkill *wifi_rfkill; | |||
94 | static struct rfkill *bluetooth_rfkill; | 94 | static struct rfkill *bluetooth_rfkill; |
95 | static struct rfkill *wwan_rfkill; | 95 | static struct rfkill *wwan_rfkill; |
96 | 96 | ||
97 | static struct dev_pm_ops hp_wmi_pm_ops = { | 97 | static const struct dev_pm_ops hp_wmi_pm_ops = { |
98 | .resume = hp_wmi_resume_handler, | 98 | .resume = hp_wmi_resume_handler, |
99 | .restore = hp_wmi_resume_handler, | 99 | .restore = hp_wmi_resume_handler, |
100 | }; | 100 | }; |
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index f2bfd296dbae..fa39e759a275 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c | |||
@@ -157,7 +157,7 @@ static int wm97xx_bat_resume(struct device *dev) | |||
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |
159 | 159 | ||
160 | static struct dev_pm_ops wm97xx_bat_pm_ops = { | 160 | static const struct dev_pm_ops wm97xx_bat_pm_ops = { |
161 | .suspend = wm97xx_bat_suspend, | 161 | .suspend = wm97xx_bat_suspend, |
162 | .resume = wm97xx_bat_resume, | 162 | .resume = wm97xx_bat_resume, |
163 | }; | 163 | }; |
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index 747ca194fad4..e6351b743da6 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c | |||
@@ -456,7 +456,7 @@ static int pxa_rtc_resume(struct device *dev) | |||
456 | return 0; | 456 | return 0; |
457 | } | 457 | } |
458 | 458 | ||
459 | static struct dev_pm_ops pxa_rtc_pm_ops = { | 459 | static const struct dev_pm_ops pxa_rtc_pm_ops = { |
460 | .suspend = pxa_rtc_suspend, | 460 | .suspend = pxa_rtc_suspend, |
461 | .resume = pxa_rtc_resume, | 461 | .resume = pxa_rtc_resume, |
462 | }; | 462 | }; |
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 29f98a70586e..e4a44b641702 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -407,7 +407,7 @@ static int sa1100_rtc_resume(struct device *dev) | |||
407 | return 0; | 407 | return 0; |
408 | } | 408 | } |
409 | 409 | ||
410 | static struct dev_pm_ops sa1100_rtc_pm_ops = { | 410 | static const struct dev_pm_ops sa1100_rtc_pm_ops = { |
411 | .suspend = sa1100_rtc_suspend, | 411 | .suspend = sa1100_rtc_suspend, |
412 | .resume = sa1100_rtc_resume, | 412 | .resume = sa1100_rtc_resume, |
413 | }; | 413 | }; |
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index e6ed5404bca0..e95cc6f8d61e 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
@@ -826,7 +826,7 @@ static int sh_rtc_resume(struct device *dev) | |||
826 | return 0; | 826 | return 0; |
827 | } | 827 | } |
828 | 828 | ||
829 | static struct dev_pm_ops sh_rtc_dev_pm_ops = { | 829 | static const struct dev_pm_ops sh_rtc_dev_pm_ops = { |
830 | .suspend = sh_rtc_suspend, | 830 | .suspend = sh_rtc_suspend, |
831 | .resume = sh_rtc_resume, | 831 | .resume = sh_rtc_resume, |
832 | }; | 832 | }; |
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index 79795cdf6ed8..000c7e481e59 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c | |||
@@ -485,7 +485,7 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev) | |||
485 | return 0; | 485 | return 0; |
486 | } | 486 | } |
487 | 487 | ||
488 | static struct dev_pm_ops wm831x_rtc_pm_ops = { | 488 | static const struct dev_pm_ops wm831x_rtc_pm_ops = { |
489 | .suspend = wm831x_rtc_suspend, | 489 | .suspend = wm831x_rtc_suspend, |
490 | .resume = wm831x_rtc_resume, | 490 | .resume = wm831x_rtc_resume, |
491 | 491 | ||
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index f76f4bd82b9f..9b43ae94beba 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
@@ -1005,7 +1005,7 @@ static int dcssblk_thaw(struct device *dev) | |||
1005 | return 0; | 1005 | return 0; |
1006 | } | 1006 | } |
1007 | 1007 | ||
1008 | static struct dev_pm_ops dcssblk_pm_ops = { | 1008 | static const struct dev_pm_ops dcssblk_pm_ops = { |
1009 | .freeze = dcssblk_freeze, | 1009 | .freeze = dcssblk_freeze, |
1010 | .thaw = dcssblk_thaw, | 1010 | .thaw = dcssblk_thaw, |
1011 | .restore = dcssblk_restore, | 1011 | .restore = dcssblk_restore, |
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index 116d1b3eeb15..118de392af63 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c | |||
@@ -407,7 +407,7 @@ static int xpram_restore(struct device *dev) | |||
407 | return 0; | 407 | return 0; |
408 | } | 408 | } |
409 | 409 | ||
410 | static struct dev_pm_ops xpram_pm_ops = { | 410 | static const struct dev_pm_ops xpram_pm_ops = { |
411 | .restore = xpram_restore, | 411 | .restore = xpram_restore, |
412 | }; | 412 | }; |
413 | 413 | ||
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index 60473f86e1f9..33e96484d54f 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c | |||
@@ -529,7 +529,7 @@ static int monreader_restore(struct device *dev) | |||
529 | return monreader_thaw(dev); | 529 | return monreader_thaw(dev); |
530 | } | 530 | } |
531 | 531 | ||
532 | static struct dev_pm_ops monreader_pm_ops = { | 532 | static const struct dev_pm_ops monreader_pm_ops = { |
533 | .freeze = monreader_freeze, | 533 | .freeze = monreader_freeze, |
534 | .thaw = monreader_thaw, | 534 | .thaw = monreader_thaw, |
535 | .restore = monreader_restore, | 535 | .restore = monreader_restore, |
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c index 6532ed8b4afa..668a0579b26b 100644 --- a/drivers/s390/char/monwriter.c +++ b/drivers/s390/char/monwriter.c | |||
@@ -323,7 +323,7 @@ static int monwriter_thaw(struct device *dev) | |||
323 | return monwriter_restore(dev); | 323 | return monwriter_restore(dev); |
324 | } | 324 | } |
325 | 325 | ||
326 | static struct dev_pm_ops monwriter_pm_ops = { | 326 | static const struct dev_pm_ops monwriter_pm_ops = { |
327 | .freeze = monwriter_freeze, | 327 | .freeze = monwriter_freeze, |
328 | .thaw = monwriter_thaw, | 328 | .thaw = monwriter_thaw, |
329 | .restore = monwriter_restore, | 329 | .restore = monwriter_restore, |
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index a983f5086788..ec88c59842e3 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c | |||
@@ -1019,7 +1019,7 @@ static int sclp_restore(struct device *dev) | |||
1019 | return sclp_undo_suspend(SCLP_PM_EVENT_RESTORE); | 1019 | return sclp_undo_suspend(SCLP_PM_EVENT_RESTORE); |
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | static struct dev_pm_ops sclp_pm_ops = { | 1022 | static const struct dev_pm_ops sclp_pm_ops = { |
1023 | .freeze = sclp_freeze, | 1023 | .freeze = sclp_freeze, |
1024 | .thaw = sclp_thaw, | 1024 | .thaw = sclp_thaw, |
1025 | .restore = sclp_restore, | 1025 | .restore = sclp_restore, |
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index 28b5afc129c3..b3beab610da4 100644 --- a/drivers/s390/char/sclp_cmd.c +++ b/drivers/s390/char/sclp_cmd.c | |||
@@ -547,7 +547,7 @@ struct read_storage_sccb { | |||
547 | u32 entries[0]; | 547 | u32 entries[0]; |
548 | } __packed; | 548 | } __packed; |
549 | 549 | ||
550 | static struct dev_pm_ops sclp_mem_pm_ops = { | 550 | static const struct dev_pm_ops sclp_mem_pm_ops = { |
551 | .freeze = sclp_mem_freeze, | 551 | .freeze = sclp_mem_freeze, |
552 | }; | 552 | }; |
553 | 553 | ||
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index 899aa795bf38..7dfa5412d5a8 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
@@ -675,7 +675,7 @@ static int vmlogrdr_pm_prepare(struct device *dev) | |||
675 | } | 675 | } |
676 | 676 | ||
677 | 677 | ||
678 | static struct dev_pm_ops vmlogrdr_pm_ops = { | 678 | static const struct dev_pm_ops vmlogrdr_pm_ops = { |
679 | .prepare = vmlogrdr_pm_prepare, | 679 | .prepare = vmlogrdr_pm_prepare, |
680 | }; | 680 | }; |
681 | 681 | ||
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index a5a62f1f7747..5f97ea2ee6b1 100644 --- a/drivers/s390/cio/ccwgroup.c +++ b/drivers/s390/cio/ccwgroup.c | |||
@@ -560,7 +560,7 @@ static int ccwgroup_pm_restore(struct device *dev) | |||
560 | return gdrv->restore ? gdrv->restore(gdev) : 0; | 560 | return gdrv->restore ? gdrv->restore(gdev) : 0; |
561 | } | 561 | } |
562 | 562 | ||
563 | static struct dev_pm_ops ccwgroup_pm_ops = { | 563 | static const struct dev_pm_ops ccwgroup_pm_ops = { |
564 | .prepare = ccwgroup_pm_prepare, | 564 | .prepare = ccwgroup_pm_prepare, |
565 | .complete = ccwgroup_pm_complete, | 565 | .complete = ccwgroup_pm_complete, |
566 | .freeze = ccwgroup_pm_freeze, | 566 | .freeze = ccwgroup_pm_freeze, |
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 92ff88ac1107..7679aee6fa14 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -1148,7 +1148,7 @@ static int css_pm_restore(struct device *dev) | |||
1148 | return drv->restore ? drv->restore(sch) : 0; | 1148 | return drv->restore ? drv->restore(sch) : 0; |
1149 | } | 1149 | } |
1150 | 1150 | ||
1151 | static struct dev_pm_ops css_pm_ops = { | 1151 | static const struct dev_pm_ops css_pm_ops = { |
1152 | .prepare = css_pm_prepare, | 1152 | .prepare = css_pm_prepare, |
1153 | .complete = css_pm_complete, | 1153 | .complete = css_pm_complete, |
1154 | .freeze = css_pm_freeze, | 1154 | .freeze = css_pm_freeze, |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 9fecfb4223a8..73901c9e260f 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -1904,7 +1904,7 @@ out_unlock: | |||
1904 | return ret; | 1904 | return ret; |
1905 | } | 1905 | } |
1906 | 1906 | ||
1907 | static struct dev_pm_ops ccw_pm_ops = { | 1907 | static const struct dev_pm_ops ccw_pm_ops = { |
1908 | .prepare = ccw_device_pm_prepare, | 1908 | .prepare = ccw_device_pm_prepare, |
1909 | .complete = ccw_device_pm_complete, | 1909 | .complete = ccw_device_pm_complete, |
1910 | .freeze = ccw_device_pm_freeze, | 1910 | .freeze = ccw_device_pm_freeze, |
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 98c04cac43c1..65ebee0a3266 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
@@ -159,7 +159,7 @@ static void netiucv_pm_complete(struct device *); | |||
159 | static int netiucv_pm_freeze(struct device *); | 159 | static int netiucv_pm_freeze(struct device *); |
160 | static int netiucv_pm_restore_thaw(struct device *); | 160 | static int netiucv_pm_restore_thaw(struct device *); |
161 | 161 | ||
162 | static struct dev_pm_ops netiucv_pm_ops = { | 162 | static const struct dev_pm_ops netiucv_pm_ops = { |
163 | .prepare = netiucv_pm_prepare, | 163 | .prepare = netiucv_pm_prepare, |
164 | .complete = netiucv_pm_complete, | 164 | .complete = netiucv_pm_complete, |
165 | .freeze = netiucv_pm_freeze, | 165 | .freeze = netiucv_pm_freeze, |
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c index 3012355f8304..67f2485d2372 100644 --- a/drivers/s390/net/smsgiucv.c +++ b/drivers/s390/net/smsgiucv.c | |||
@@ -168,7 +168,7 @@ static int smsg_pm_restore_thaw(struct device *dev) | |||
168 | return 0; | 168 | return 0; |
169 | } | 169 | } |
170 | 170 | ||
171 | static struct dev_pm_ops smsg_pm_ops = { | 171 | static const struct dev_pm_ops smsg_pm_ops = { |
172 | .freeze = smsg_pm_freeze, | 172 | .freeze = smsg_pm_freeze, |
173 | .thaw = smsg_pm_restore_thaw, | 173 | .thaw = smsg_pm_restore_thaw, |
174 | .restore = smsg_pm_restore_thaw, | 174 | .restore = smsg_pm_restore_thaw, |
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 4a821046baae..56ee082157aa 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
@@ -756,7 +756,7 @@ static int serial_pxa_resume(struct device *dev) | |||
756 | return 0; | 756 | return 0; |
757 | } | 757 | } |
758 | 758 | ||
759 | static struct dev_pm_ops serial_pxa_pm_ops = { | 759 | static const struct dev_pm_ops serial_pxa_pm_ops = { |
760 | .suspend = serial_pxa_suspend, | 760 | .suspend = serial_pxa_suspend, |
761 | .resume = serial_pxa_resume, | 761 | .resume = serial_pxa_resume, |
762 | }; | 762 | }; |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index ff38dbdb5c6e..7e3f4ff58cfd 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -1312,7 +1312,7 @@ static int sci_resume(struct device *dev) | |||
1312 | return 0; | 1312 | return 0; |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | static struct dev_pm_ops sci_dev_pm_ops = { | 1315 | static const struct dev_pm_ops sci_dev_pm_ops = { |
1316 | .suspend = sci_suspend, | 1316 | .suspend = sci_suspend, |
1317 | .resume = sci_resume, | 1317 | .resume = sci_resume, |
1318 | }; | 1318 | }; |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index c8c2b693ffac..c2f707e5ce74 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -1709,7 +1709,7 @@ static int pxa2xx_spi_resume(struct device *dev) | |||
1709 | return 0; | 1709 | return 0; |
1710 | } | 1710 | } |
1711 | 1711 | ||
1712 | static struct dev_pm_ops pxa2xx_spi_pm_ops = { | 1712 | static const struct dev_pm_ops pxa2xx_spi_pm_ops = { |
1713 | .suspend = pxa2xx_spi_suspend, | 1713 | .suspend = pxa2xx_spi_suspend, |
1714 | .resume = pxa2xx_spi_resume, | 1714 | .resume = pxa2xx_spi_resume, |
1715 | }; | 1715 | }; |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 33d94f76b9ef..276591569c8b 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
@@ -489,7 +489,7 @@ static int s3c24xx_spi_resume(struct device *dev) | |||
489 | return 0; | 489 | return 0; |
490 | } | 490 | } |
491 | 491 | ||
492 | static struct dev_pm_ops s3c24xx_spi_pmops = { | 492 | static const struct dev_pm_ops s3c24xx_spi_pmops = { |
493 | .suspend = s3c24xx_spi_suspend, | 493 | .suspend = s3c24xx_spi_suspend, |
494 | .resume = s3c24xx_spi_resume, | 494 | .resume = s3c24xx_spi_resume, |
495 | }; | 495 | }; |
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index aa53db9f2e88..1ef3b8fc50b3 100644 --- a/drivers/uio/uio_pdrv_genirq.c +++ b/drivers/uio/uio_pdrv_genirq.c | |||
@@ -210,7 +210,7 @@ static int uio_pdrv_genirq_runtime_nop(struct device *dev) | |||
210 | return 0; | 210 | return 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | static struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = { | 213 | static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = { |
214 | .runtime_suspend = uio_pdrv_genirq_runtime_nop, | 214 | .runtime_suspend = uio_pdrv_genirq_runtime_nop, |
215 | .runtime_resume = uio_pdrv_genirq_runtime_nop, | 215 | .runtime_resume = uio_pdrv_genirq_runtime_nop, |
216 | }; | 216 | }; |
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 91f2885b6ee1..2dcf906df569 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c | |||
@@ -363,7 +363,7 @@ static int hcd_pci_restore(struct device *dev) | |||
363 | return resume_common(dev, true); | 363 | return resume_common(dev, true); |
364 | } | 364 | } |
365 | 365 | ||
366 | struct dev_pm_ops usb_hcd_pci_pm_ops = { | 366 | const struct dev_pm_ops usb_hcd_pci_pm_ops = { |
367 | .suspend = hcd_pci_suspend, | 367 | .suspend = hcd_pci_suspend, |
368 | .suspend_noirq = hcd_pci_suspend_noirq, | 368 | .suspend_noirq = hcd_pci_suspend_noirq, |
369 | .resume_noirq = hcd_pci_resume_noirq, | 369 | .resume_noirq = hcd_pci_resume_noirq, |
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h index d8b43aee581e..bbe2b924aae8 100644 --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h | |||
@@ -330,7 +330,7 @@ extern void usb_hcd_pci_remove(struct pci_dev *dev); | |||
330 | extern void usb_hcd_pci_shutdown(struct pci_dev *dev); | 330 | extern void usb_hcd_pci_shutdown(struct pci_dev *dev); |
331 | 331 | ||
332 | #ifdef CONFIG_PM_SLEEP | 332 | #ifdef CONFIG_PM_SLEEP |
333 | extern struct dev_pm_ops usb_hcd_pci_pm_ops; | 333 | extern const struct dev_pm_ops usb_hcd_pci_pm_ops; |
334 | #endif | 334 | #endif |
335 | #endif /* CONFIG_PCI */ | 335 | #endif /* CONFIG_PCI */ |
336 | 336 | ||
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 4e2c6df8d3cc..043fa833eeca 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -320,7 +320,7 @@ static int usb_dev_restore(struct device *dev) | |||
320 | return usb_resume(dev, PMSG_RESTORE); | 320 | return usb_resume(dev, PMSG_RESTORE); |
321 | } | 321 | } |
322 | 322 | ||
323 | static struct dev_pm_ops usb_device_pm_ops = { | 323 | static const struct dev_pm_ops usb_device_pm_ops = { |
324 | .prepare = usb_dev_prepare, | 324 | .prepare = usb_dev_prepare, |
325 | .complete = usb_dev_complete, | 325 | .complete = usb_dev_complete, |
326 | .suspend = usb_dev_suspend, | 326 | .suspend = usb_dev_suspend, |
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c index ed77be76d6bb..dbfb482a94e3 100644 --- a/drivers/usb/host/ehci-au1xxx.c +++ b/drivers/usb/host/ehci-au1xxx.c | |||
@@ -297,7 +297,7 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev) | |||
297 | return 0; | 297 | return 0; |
298 | } | 298 | } |
299 | 299 | ||
300 | static struct dev_pm_ops au1xxx_ehci_pmops = { | 300 | static const struct dev_pm_ops au1xxx_ehci_pmops = { |
301 | .suspend = ehci_hcd_au1xxx_drv_suspend, | 301 | .suspend = ehci_hcd_au1xxx_drv_suspend, |
302 | .resume = ehci_hcd_au1xxx_drv_resume, | 302 | .resume = ehci_hcd_au1xxx_drv_resume, |
303 | }; | 303 | }; |
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index e4380082ebb1..17a6043c1fa0 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
@@ -294,7 +294,7 @@ static int ohci_hcd_au1xxx_drv_resume(struct device *dev) | |||
294 | return 0; | 294 | return 0; |
295 | } | 295 | } |
296 | 296 | ||
297 | static struct dev_pm_ops au1xxx_ohci_pmops = { | 297 | static const struct dev_pm_ops au1xxx_ohci_pmops = { |
298 | .suspend = ohci_hcd_au1xxx_drv_suspend, | 298 | .suspend = ohci_hcd_au1xxx_drv_suspend, |
299 | .resume = ohci_hcd_au1xxx_drv_resume, | 299 | .resume = ohci_hcd_au1xxx_drv_resume, |
300 | }; | 300 | }; |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index f1c06202fdf2..a18debdd79b8 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -518,7 +518,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct device *dev) | |||
518 | return 0; | 518 | return 0; |
519 | } | 519 | } |
520 | 520 | ||
521 | static struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = { | 521 | static const struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = { |
522 | .suspend = ohci_hcd_pxa27x_drv_suspend, | 522 | .suspend = ohci_hcd_pxa27x_drv_suspend, |
523 | .resume = ohci_hcd_pxa27x_drv_resume, | 523 | .resume = ohci_hcd_pxa27x_drv_resume, |
524 | }; | 524 | }; |
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 41dbc70ae752..b7a661c02bcd 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
@@ -2353,7 +2353,7 @@ static int r8a66597_resume(struct device *dev) | |||
2353 | return 0; | 2353 | return 0; |
2354 | } | 2354 | } |
2355 | 2355 | ||
2356 | static struct dev_pm_ops r8a66597_dev_pm_ops = { | 2356 | static const struct dev_pm_ops r8a66597_dev_pm_ops = { |
2357 | .suspend = r8a66597_suspend, | 2357 | .suspend = r8a66597_suspend, |
2358 | .resume = r8a66597_resume, | 2358 | .resume = r8a66597_resume, |
2359 | .poweroff = r8a66597_suspend, | 2359 | .poweroff = r8a66597_suspend, |
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 49f2346afad3..bfe08f4975a3 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
@@ -2214,7 +2214,7 @@ static int musb_resume_noirq(struct device *dev) | |||
2214 | return 0; | 2214 | return 0; |
2215 | } | 2215 | } |
2216 | 2216 | ||
2217 | static struct dev_pm_ops musb_dev_pm_ops = { | 2217 | static const struct dev_pm_ops musb_dev_pm_ops = { |
2218 | .suspend = musb_suspend, | 2218 | .suspend = musb_suspend, |
2219 | .resume_noirq = musb_resume_noirq, | 2219 | .resume_noirq = musb_resume_noirq, |
2220 | }; | 2220 | }; |
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c index 7fcb0eb54c60..f2d76dae1eb3 100644 --- a/drivers/video/backlight/da903x_bl.c +++ b/drivers/video/backlight/da903x_bl.c | |||
@@ -177,7 +177,7 @@ static int da903x_backlight_resume(struct device *dev) | |||
177 | return 0; | 177 | return 0; |
178 | } | 178 | } |
179 | 179 | ||
180 | static struct dev_pm_ops da903x_backlight_pm_ops = { | 180 | static const struct dev_pm_ops da903x_backlight_pm_ops = { |
181 | .suspend = da903x_backlight_suspend, | 181 | .suspend = da903x_backlight_suspend, |
182 | .resume = da903x_backlight_resume, | 182 | .resume = da903x_backlight_resume, |
183 | }; | 183 | }; |
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index e7116a6d82d3..73c83a8de2d3 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c | |||
@@ -456,7 +456,7 @@ static int hitfb_resume(struct device *dev) | |||
456 | return 0; | 456 | return 0; |
457 | } | 457 | } |
458 | 458 | ||
459 | static struct dev_pm_ops hitfb_dev_pm_ops = { | 459 | static const struct dev_pm_ops hitfb_dev_pm_ops = { |
460 | .suspend = hitfb_suspend, | 460 | .suspend = hitfb_suspend, |
461 | .resume = hitfb_resume, | 461 | .resume = hitfb_resume, |
462 | }; | 462 | }; |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index f58a3aae6ea6..b7e58059b592 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -1667,7 +1667,7 @@ static int pxafb_resume(struct device *dev) | |||
1667 | return 0; | 1667 | return 0; |
1668 | } | 1668 | } |
1669 | 1669 | ||
1670 | static struct dev_pm_ops pxafb_pm_ops = { | 1670 | static const struct dev_pm_ops pxafb_pm_ops = { |
1671 | .suspend = pxafb_suspend, | 1671 | .suspend = pxafb_suspend, |
1672 | .resume = pxafb_resume, | 1672 | .resume = pxafb_resume, |
1673 | }; | 1673 | }; |
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index b4b5de930cf5..8a65fb6648a6 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
@@ -890,7 +890,7 @@ static int sh_mobile_lcdc_runtime_resume(struct device *dev) | |||
890 | return 0; | 890 | return 0; |
891 | } | 891 | } |
892 | 892 | ||
893 | static struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = { | 893 | static const struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = { |
894 | .suspend = sh_mobile_lcdc_suspend, | 894 | .suspend = sh_mobile_lcdc_suspend, |
895 | .resume = sh_mobile_lcdc_resume, | 895 | .resume = sh_mobile_lcdc_resume, |
896 | .runtime_suspend = sh_mobile_lcdc_runtime_suspend, | 896 | .runtime_suspend = sh_mobile_lcdc_runtime_suspend, |
diff --git a/drivers/watchdog/adx_wdt.c b/drivers/watchdog/adx_wdt.c index 77afb0acc500..9c6594473d3b 100644 --- a/drivers/watchdog/adx_wdt.c +++ b/drivers/watchdog/adx_wdt.c | |||
@@ -314,7 +314,7 @@ static int adx_wdt_resume(struct device *dev) | |||
314 | return 0; | 314 | return 0; |
315 | } | 315 | } |
316 | 316 | ||
317 | static struct dev_pm_ops adx_wdt_pm_ops = { | 317 | static const struct dev_pm_ops adx_wdt_pm_ops = { |
318 | .suspend = adx_wdt_suspend, | 318 | .suspend = adx_wdt_suspend, |
319 | .resume = adx_wdt_resume, | 319 | .resume = adx_wdt_resume, |
320 | }; | 320 | }; |