瀏覽代碼

const: constify remaining dev_pm_ops

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Alexey Dobriyan 15 年之前
父節點
當前提交
471452104b
共有 76 個文件被更改,包括 76 次插入76 次删除
  1. 1 1
      arch/arm/plat-omap/debug-leds.c
  2. 1 1
      arch/arm/plat-omap/gpio.c
  3. 1 1
      arch/s390/appldata/appldata_base.c
  4. 1 1
      drivers/block/floppy.c
  5. 1 1
      drivers/char/hvc_iucv.c
  6. 1 1
      drivers/dma/at_hdmac.c
  7. 1 1
      drivers/dma/dw_dmac.c
  8. 1 1
      drivers/dma/txx9dmac.c
  9. 1 1
      drivers/hwmon/applesmc.c
  10. 1 1
      drivers/i2c/busses/i2c-pxa.c
  11. 1 1
      drivers/i2c/busses/i2c-s3c2410.c
  12. 1 1
      drivers/i2c/busses/i2c-sh_mobile.c
  13. 1 1
      drivers/input/keyboard/adp5588-keys.c
  14. 1 1
      drivers/input/keyboard/sh_keysc.c
  15. 1 1
      drivers/input/misc/bfin_rotary.c
  16. 1 1
      drivers/input/misc/pcspkr.c
  17. 1 1
      drivers/input/touchscreen/pcap_ts.c
  18. 1 1
      drivers/media/video/davinci/vpfe_capture.c
  19. 1 1
      drivers/media/video/davinci/vpif_capture.c
  20. 1 1
      drivers/media/video/sh_mobile_ceu_camera.c
  21. 1 1
      drivers/mmc/host/pxamci.c
  22. 1 1
      drivers/mmc/host/s3cmci.c
  23. 1 1
      drivers/mtd/nand/nomadik_nand.c
  24. 1 1
      drivers/net/3c59x.c
  25. 1 1
      drivers/net/dm9000.c
  26. 1 1
      drivers/net/r8169.c
  27. 1 1
      drivers/net/smsc911x.c
  28. 1 1
      drivers/net/vmxnet3/vmxnet3_drv.c
  29. 1 1
      drivers/pci/pcie/portdrv_pci.c
  30. 1 1
      drivers/pcmcia/pxa2xx_base.c
  31. 1 1
      drivers/pcmcia/yenta_socket.c
  32. 1 1
      drivers/platform/x86/acerhdf.c
  33. 1 1
      drivers/platform/x86/eeepc-laptop.c
  34. 1 1
      drivers/platform/x86/hp-wmi.c
  35. 1 1
      drivers/power/wm97xx_battery.c
  36. 1 1
      drivers/rtc/rtc-pxa.c
  37. 1 1
      drivers/rtc/rtc-sa1100.c
  38. 1 1
      drivers/rtc/rtc-sh.c
  39. 1 1
      drivers/rtc/rtc-wm831x.c
  40. 1 1
      drivers/s390/block/dcssblk.c
  41. 1 1
      drivers/s390/block/xpram.c
  42. 1 1
      drivers/s390/char/monreader.c
  43. 1 1
      drivers/s390/char/monwriter.c
  44. 1 1
      drivers/s390/char/sclp.c
  45. 1 1
      drivers/s390/char/sclp_cmd.c
  46. 1 1
      drivers/s390/char/vmlogrdr.c
  47. 1 1
      drivers/s390/cio/ccwgroup.c
  48. 1 1
      drivers/s390/cio/css.c
  49. 1 1
      drivers/s390/cio/device.c
  50. 1 1
      drivers/s390/net/netiucv.c
  51. 1 1
      drivers/s390/net/smsgiucv.c
  52. 1 1
      drivers/serial/pxa.c
  53. 1 1
      drivers/serial/sh-sci.c
  54. 1 1
      drivers/spi/pxa2xx_spi.c
  55. 1 1
      drivers/spi/spi_s3c24xx.c
  56. 1 1
      drivers/uio/uio_pdrv_genirq.c
  57. 1 1
      drivers/usb/core/hcd-pci.c
  58. 1 1
      drivers/usb/core/hcd.h
  59. 1 1
      drivers/usb/core/usb.c
  60. 1 1
      drivers/usb/host/ehci-au1xxx.c
  61. 1 1
      drivers/usb/host/ohci-au1xxx.c
  62. 1 1
      drivers/usb/host/ohci-pxa27x.c
  63. 1 1
      drivers/usb/host/r8a66597-hcd.c
  64. 1 1
      drivers/usb/musb/musb_core.c
  65. 1 1
      drivers/video/backlight/da903x_bl.c
  66. 1 1
      drivers/video/hitfb.c
  67. 1 1
      drivers/video/pxafb.c
  68. 1 1
      drivers/video/sh_mobile_lcdcfb.c
  69. 1 1
      drivers/watchdog/adx_wdt.c
  70. 1 1
      include/linux/pm.h
  71. 1 1
      net/iucv/af_iucv.c
  72. 1 1
      net/iucv/iucv.c
  73. 1 1
      sound/arm/pxa2xx-ac97.c
  74. 1 1
      sound/soc/s3c24xx/s3c24xx_simtec.c
  75. 1 1
      sound/soc/s3c24xx/s3c24xx_simtec.h
  76. 1 1
      sound/soc/soc-core.c

+ 1 - 1
arch/arm/plat-omap/debug-leds.c

@@ -293,7 +293,7 @@ static int fpga_resume_noirq(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops fpga_dev_pm_ops = {
+static const struct dev_pm_ops fpga_dev_pm_ops = {
 	.suspend_noirq = fpga_suspend_noirq,
 	.suspend_noirq = fpga_suspend_noirq,
 	.resume_noirq = fpga_resume_noirq,
 	.resume_noirq = fpga_resume_noirq,
 };
 };

+ 1 - 1
arch/arm/plat-omap/gpio.c

@@ -1431,7 +1431,7 @@ static int omap_mpuio_resume_noirq(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops omap_mpuio_dev_pm_ops = {
+static const struct dev_pm_ops omap_mpuio_dev_pm_ops = {
 	.suspend_noirq = omap_mpuio_suspend_noirq,
 	.suspend_noirq = omap_mpuio_suspend_noirq,
 	.resume_noirq = omap_mpuio_resume_noirq,
 	.resume_noirq = omap_mpuio_resume_noirq,
 };
 };

+ 1 - 1
arch/s390/appldata/appldata_base.c

@@ -551,7 +551,7 @@ static int appldata_thaw(struct device *dev)
 	return appldata_restore(dev);
 	return appldata_restore(dev);
 }
 }
 
 
-static struct dev_pm_ops appldata_pm_ops = {
+static const struct dev_pm_ops appldata_pm_ops = {
 	.freeze		= appldata_freeze,
 	.freeze		= appldata_freeze,
 	.thaw		= appldata_thaw,
 	.thaw		= appldata_thaw,
 	.restore	= appldata_restore,
 	.restore	= appldata_restore,

+ 1 - 1
drivers/block/floppy.c

@@ -4162,7 +4162,7 @@ static int floppy_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops floppy_pm_ops = {
+static const struct dev_pm_ops floppy_pm_ops = {
 	.resume = floppy_resume,
 	.resume = floppy_resume,
 	.restore = floppy_resume,
 	.restore = floppy_resume,
 };
 };

+ 1 - 1
drivers/char/hvc_iucv.c

@@ -931,7 +931,7 @@ static struct hv_ops hvc_iucv_ops = {
 };
 };
 
 
 /* Suspend / resume device operations */
 /* Suspend / resume device operations */
-static struct dev_pm_ops hvc_iucv_pm_ops = {
+static const struct dev_pm_ops hvc_iucv_pm_ops = {
 	.freeze	  = hvc_iucv_pm_freeze,
 	.freeze	  = hvc_iucv_pm_freeze,
 	.thaw	  = hvc_iucv_pm_restore_thaw,
 	.thaw	  = hvc_iucv_pm_restore_thaw,
 	.restore  = hvc_iucv_pm_restore_thaw,
 	.restore  = hvc_iucv_pm_restore_thaw,

+ 1 - 1
drivers/dma/at_hdmac.c

@@ -1188,7 +1188,7 @@ static int at_dma_resume_noirq(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops at_dma_dev_pm_ops = {
+static const struct dev_pm_ops at_dma_dev_pm_ops = {
 	.suspend_noirq = at_dma_suspend_noirq,
 	.suspend_noirq = at_dma_suspend_noirq,
 	.resume_noirq = at_dma_resume_noirq,
 	.resume_noirq = at_dma_resume_noirq,
 };
 };

+ 1 - 1
drivers/dma/dw_dmac.c

@@ -1427,7 +1427,7 @@ static int dw_resume_noirq(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops dw_dev_pm_ops = {
+static const struct dev_pm_ops dw_dev_pm_ops = {
 	.suspend_noirq = dw_suspend_noirq,
 	.suspend_noirq = dw_suspend_noirq,
 	.resume_noirq = dw_resume_noirq,
 	.resume_noirq = dw_resume_noirq,
 };
 };

+ 1 - 1
drivers/dma/txx9dmac.c

@@ -1313,7 +1313,7 @@ static int txx9dmac_resume_noirq(struct device *dev)
 
 
 }
 }
 
 
-static struct dev_pm_ops txx9dmac_dev_pm_ops = {
+static const struct dev_pm_ops txx9dmac_dev_pm_ops = {
 	.suspend_noirq = txx9dmac_suspend_noirq,
 	.suspend_noirq = txx9dmac_suspend_noirq,
 	.resume_noirq = txx9dmac_resume_noirq,
 	.resume_noirq = txx9dmac_resume_noirq,
 };
 };

+ 1 - 1
drivers/hwmon/applesmc.c

@@ -518,7 +518,7 @@ static int applesmc_pm_restore(struct device *dev)
 	return applesmc_pm_resume(dev);
 	return applesmc_pm_resume(dev);
 }
 }
 
 
-static struct dev_pm_ops applesmc_pm_ops = {
+static const struct dev_pm_ops applesmc_pm_ops = {
 	.resume = applesmc_pm_resume,
 	.resume = applesmc_pm_resume,
 	.restore = applesmc_pm_restore,
 	.restore = applesmc_pm_restore,
 };
 };

+ 1 - 1
drivers/i2c/busses/i2c-pxa.c

@@ -1155,7 +1155,7 @@ static int i2c_pxa_resume_noirq(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops i2c_pxa_dev_pm_ops = {
+static const struct dev_pm_ops i2c_pxa_dev_pm_ops = {
 	.suspend_noirq = i2c_pxa_suspend_noirq,
 	.suspend_noirq = i2c_pxa_suspend_noirq,
 	.resume_noirq = i2c_pxa_resume_noirq,
 	.resume_noirq = i2c_pxa_resume_noirq,
 };
 };

+ 1 - 1
drivers/i2c/busses/i2c-s3c2410.c

@@ -967,7 +967,7 @@ static int s3c24xx_i2c_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {
+static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {
 	.suspend_noirq = s3c24xx_i2c_suspend_noirq,
 	.suspend_noirq = s3c24xx_i2c_suspend_noirq,
 	.resume = s3c24xx_i2c_resume,
 	.resume = s3c24xx_i2c_resume,
 };
 };

+ 1 - 1
drivers/i2c/busses/i2c-sh_mobile.c

@@ -647,7 +647,7 @@ static int sh_mobile_i2c_runtime_nop(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = {
+static const struct dev_pm_ops sh_mobile_i2c_dev_pm_ops = {
 	.runtime_suspend = sh_mobile_i2c_runtime_nop,
 	.runtime_suspend = sh_mobile_i2c_runtime_nop,
 	.runtime_resume = sh_mobile_i2c_runtime_nop,
 	.runtime_resume = sh_mobile_i2c_runtime_nop,
 };
 };

+ 1 - 1
drivers/input/keyboard/adp5588-keys.c

@@ -319,7 +319,7 @@ static int adp5588_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops adp5588_dev_pm_ops = {
+static const struct dev_pm_ops adp5588_dev_pm_ops = {
 	.suspend = adp5588_suspend,
 	.suspend = adp5588_suspend,
 	.resume  = adp5588_resume,
 	.resume  = adp5588_resume,
 };
 };

+ 1 - 1
drivers/input/keyboard/sh_keysc.c

@@ -295,7 +295,7 @@ static int sh_keysc_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops sh_keysc_dev_pm_ops = {
+static const struct dev_pm_ops sh_keysc_dev_pm_ops = {
 	.suspend = sh_keysc_suspend,
 	.suspend = sh_keysc_suspend,
 	.resume = sh_keysc_resume,
 	.resume = sh_keysc_resume,
 };
 };

+ 1 - 1
drivers/input/misc/bfin_rotary.c

@@ -247,7 +247,7 @@ static int bfin_rotary_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops bfin_rotary_pm_ops = {
+static const struct dev_pm_ops bfin_rotary_pm_ops = {
 	.suspend	= bfin_rotary_suspend,
 	.suspend	= bfin_rotary_suspend,
 	.resume		= bfin_rotary_resume,
 	.resume		= bfin_rotary_resume,
 };
 };

+ 1 - 1
drivers/input/misc/pcspkr.c

@@ -127,7 +127,7 @@ static void pcspkr_shutdown(struct platform_device *dev)
 	pcspkr_event(NULL, EV_SND, SND_BELL, 0);
 	pcspkr_event(NULL, EV_SND, SND_BELL, 0);
 }
 }
 
 
-static struct dev_pm_ops pcspkr_pm_ops = {
+static const struct dev_pm_ops pcspkr_pm_ops = {
 	.suspend = pcspkr_suspend,
 	.suspend = pcspkr_suspend,
 };
 };
 
 

+ 1 - 1
drivers/input/touchscreen/pcap_ts.c

@@ -233,7 +233,7 @@ static int pcap_ts_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops pcap_ts_pm_ops = {
+static const struct dev_pm_ops pcap_ts_pm_ops = {
 	.suspend	= pcap_ts_suspend,
 	.suspend	= pcap_ts_suspend,
 	.resume		= pcap_ts_resume,
 	.resume		= pcap_ts_resume,
 };
 };

+ 1 - 1
drivers/media/video/davinci/vpfe_capture.c

@@ -2127,7 +2127,7 @@ vpfe_resume(struct device *dev)
 	return -1;
 	return -1;
 }
 }
 
 
-static struct dev_pm_ops vpfe_dev_pm_ops = {
+static const struct dev_pm_ops vpfe_dev_pm_ops = {
 	.suspend = vpfe_suspend,
 	.suspend = vpfe_suspend,
 	.resume = vpfe_resume,
 	.resume = vpfe_resume,
 };
 };

+ 1 - 1
drivers/media/video/davinci/vpif_capture.c

@@ -2107,7 +2107,7 @@ vpif_resume(struct device *dev)
 	return -1;
 	return -1;
 }
 }
 
 
-static struct dev_pm_ops vpif_dev_pm_ops = {
+static const struct dev_pm_ops vpif_dev_pm_ops = {
 	.suspend = vpif_suspend,
 	.suspend = vpif_suspend,
 	.resume = vpif_resume,
 	.resume = vpif_resume,
 };
 };

+ 1 - 1
drivers/media/video/sh_mobile_ceu_camera.c

@@ -1825,7 +1825,7 @@ static int sh_mobile_ceu_runtime_nop(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops sh_mobile_ceu_dev_pm_ops = {
+static const struct dev_pm_ops sh_mobile_ceu_dev_pm_ops = {
 	.runtime_suspend = sh_mobile_ceu_runtime_nop,
 	.runtime_suspend = sh_mobile_ceu_runtime_nop,
 	.runtime_resume = sh_mobile_ceu_runtime_nop,
 	.runtime_resume = sh_mobile_ceu_runtime_nop,
 };
 };

+ 1 - 1
drivers/mmc/host/pxamci.c

@@ -828,7 +828,7 @@ static int pxamci_resume(struct device *dev)
 	return ret;
 	return ret;
 }
 }
 
 
-static struct dev_pm_ops pxamci_pm_ops = {
+static const struct dev_pm_ops pxamci_pm_ops = {
 	.suspend	= pxamci_suspend,
 	.suspend	= pxamci_suspend,
 	.resume		= pxamci_resume,
 	.resume		= pxamci_resume,
 };
 };

+ 1 - 1
drivers/mmc/host/s3cmci.c

@@ -1892,7 +1892,7 @@ static int s3cmci_resume(struct device *dev)
 	return mmc_resume_host(mmc);
 	return mmc_resume_host(mmc);
 }
 }
 
 
-static struct dev_pm_ops s3cmci_pm = {
+static const struct dev_pm_ops s3cmci_pm = {
 	.suspend	= s3cmci_suspend,
 	.suspend	= s3cmci_suspend,
 	.resume		= s3cmci_resume,
 	.resume		= s3cmci_resume,
 };
 };

+ 1 - 1
drivers/mtd/nand/nomadik_nand.c

@@ -216,7 +216,7 @@ static int nomadik_nand_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops nomadik_nand_pm_ops = {
+static const struct dev_pm_ops nomadik_nand_pm_ops = {
 	.suspend = nomadik_nand_suspend,
 	.suspend = nomadik_nand_suspend,
 	.resume = nomadik_nand_resume,
 	.resume = nomadik_nand_resume,
 };
 };

+ 1 - 1
drivers/net/3c59x.c

@@ -837,7 +837,7 @@ static int vortex_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops vortex_pm_ops = {
+static const struct dev_pm_ops vortex_pm_ops = {
 	.suspend = vortex_suspend,
 	.suspend = vortex_suspend,
 	.resume = vortex_resume,
 	.resume = vortex_resume,
 	.freeze = vortex_suspend,
 	.freeze = vortex_suspend,

+ 1 - 1
drivers/net/dm9000.c

@@ -1646,7 +1646,7 @@ dm9000_drv_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops dm9000_drv_pm_ops = {
+static const struct dev_pm_ops dm9000_drv_pm_ops = {
 	.suspend	= dm9000_drv_suspend,
 	.suspend	= dm9000_drv_suspend,
 	.resume		= dm9000_drv_resume,
 	.resume		= dm9000_drv_resume,
 };
 };

+ 1 - 1
drivers/net/r8169.c

@@ -4859,7 +4859,7 @@ out:
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops rtl8169_pm_ops = {
+static const struct dev_pm_ops rtl8169_pm_ops = {
 	.suspend = rtl8169_suspend,
 	.suspend = rtl8169_suspend,
 	.resume = rtl8169_resume,
 	.resume = rtl8169_resume,
 	.freeze = rtl8169_suspend,
 	.freeze = rtl8169_suspend,

+ 1 - 1
drivers/net/smsc911x.c

@@ -2154,7 +2154,7 @@ static int smsc911x_resume(struct device *dev)
 	return (to == 0) ? -EIO : 0;
 	return (to == 0) ? -EIO : 0;
 }
 }
 
 
-static struct dev_pm_ops smsc911x_pm_ops = {
+static const struct dev_pm_ops smsc911x_pm_ops = {
 	.suspend	= smsc911x_suspend,
 	.suspend	= smsc911x_suspend,
 	.resume		= smsc911x_resume,
 	.resume		= smsc911x_resume,
 };
 };

+ 1 - 1
drivers/net/vmxnet3/vmxnet3_drv.c

@@ -2689,7 +2689,7 @@ vmxnet3_resume(struct device *device)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops vmxnet3_pm_ops = {
+static const struct dev_pm_ops vmxnet3_pm_ops = {
 	.suspend = vmxnet3_suspend,
 	.suspend = vmxnet3_suspend,
 	.resume = vmxnet3_resume,
 	.resume = vmxnet3_resume,
 };
 };

+ 1 - 1
drivers/pci/pcie/portdrv_pci.c

@@ -43,7 +43,7 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev)
 }
 }
 
 
 #ifdef CONFIG_PM
 #ifdef CONFIG_PM
-static struct dev_pm_ops pcie_portdrv_pm_ops = {
+static const struct dev_pm_ops pcie_portdrv_pm_ops = {
 	.suspend	= pcie_port_device_suspend,
 	.suspend	= pcie_port_device_suspend,
 	.resume		= pcie_port_device_resume,
 	.resume		= pcie_port_device_resume,
 	.freeze		= pcie_port_device_suspend,
 	.freeze		= pcie_port_device_suspend,

+ 1 - 1
drivers/pcmcia/pxa2xx_base.c

@@ -336,7 +336,7 @@ static int pxa2xx_drv_pcmcia_resume(struct device *dev)
 	return pcmcia_socket_dev_resume(dev);
 	return pcmcia_socket_dev_resume(dev);
 }
 }
 
 
-static struct dev_pm_ops  pxa2xx_drv_pcmcia_pm_ops = {
+static const struct dev_pm_ops pxa2xx_drv_pcmcia_pm_ops = {
 	.suspend	= pxa2xx_drv_pcmcia_suspend,
 	.suspend	= pxa2xx_drv_pcmcia_suspend,
 	.resume		= pxa2xx_drv_pcmcia_resume,
 	.resume		= pxa2xx_drv_pcmcia_resume,
 };
 };

+ 1 - 1
drivers/pcmcia/yenta_socket.c

@@ -1330,7 +1330,7 @@ static int yenta_dev_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops yenta_pm_ops = {
+static const struct dev_pm_ops yenta_pm_ops = {
 	.suspend_noirq = yenta_dev_suspend_noirq,
 	.suspend_noirq = yenta_dev_suspend_noirq,
 	.resume_noirq = yenta_dev_resume_noirq,
 	.resume_noirq = yenta_dev_resume_noirq,
 	.resume = yenta_dev_resume,
 	.resume = yenta_dev_resume,

+ 1 - 1
drivers/platform/x86/acerhdf.c

@@ -460,7 +460,7 @@ static int acerhdf_remove(struct platform_device *device)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops acerhdf_pm_ops = {
+static const struct dev_pm_ops acerhdf_pm_ops = {
 	.suspend = acerhdf_suspend,
 	.suspend = acerhdf_suspend,
 	.freeze  = acerhdf_suspend,
 	.freeze  = acerhdf_suspend,
 };
 };

+ 1 - 1
drivers/platform/x86/eeepc-laptop.c

@@ -154,7 +154,7 @@ static struct eeepc_hotk *ehotk;
 static int eeepc_hotk_thaw(struct device *device);
 static int eeepc_hotk_thaw(struct device *device);
 static int eeepc_hotk_restore(struct device *device);
 static int eeepc_hotk_restore(struct device *device);
 
 
-static struct dev_pm_ops eeepc_pm_ops = {
+static const struct dev_pm_ops eeepc_pm_ops = {
 	.thaw = eeepc_hotk_thaw,
 	.thaw = eeepc_hotk_thaw,
 	.restore = eeepc_hotk_restore,
 	.restore = eeepc_hotk_restore,
 };
 };

+ 1 - 1
drivers/platform/x86/hp-wmi.c

@@ -94,7 +94,7 @@ static struct rfkill *wifi_rfkill;
 static struct rfkill *bluetooth_rfkill;
 static struct rfkill *bluetooth_rfkill;
 static struct rfkill *wwan_rfkill;
 static struct rfkill *wwan_rfkill;
 
 
-static struct dev_pm_ops hp_wmi_pm_ops = {
+static const struct dev_pm_ops hp_wmi_pm_ops = {
 	.resume  = hp_wmi_resume_handler,
 	.resume  = hp_wmi_resume_handler,
 	.restore  = hp_wmi_resume_handler,
 	.restore  = hp_wmi_resume_handler,
 };
 };

+ 1 - 1
drivers/power/wm97xx_battery.c

@@ -157,7 +157,7 @@ static int wm97xx_bat_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops wm97xx_bat_pm_ops = {
+static const struct dev_pm_ops wm97xx_bat_pm_ops = {
 	.suspend	= wm97xx_bat_suspend,
 	.suspend	= wm97xx_bat_suspend,
 	.resume		= wm97xx_bat_resume,
 	.resume		= wm97xx_bat_resume,
 };
 };

+ 1 - 1
drivers/rtc/rtc-pxa.c

@@ -456,7 +456,7 @@ static int pxa_rtc_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops pxa_rtc_pm_ops = {
+static const struct dev_pm_ops pxa_rtc_pm_ops = {
 	.suspend	= pxa_rtc_suspend,
 	.suspend	= pxa_rtc_suspend,
 	.resume		= pxa_rtc_resume,
 	.resume		= pxa_rtc_resume,
 };
 };

+ 1 - 1
drivers/rtc/rtc-sa1100.c

@@ -407,7 +407,7 @@ static int sa1100_rtc_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops sa1100_rtc_pm_ops = {
+static const struct dev_pm_ops sa1100_rtc_pm_ops = {
 	.suspend	= sa1100_rtc_suspend,
 	.suspend	= sa1100_rtc_suspend,
 	.resume		= sa1100_rtc_resume,
 	.resume		= sa1100_rtc_resume,
 };
 };

+ 1 - 1
drivers/rtc/rtc-sh.c

@@ -826,7 +826,7 @@ static int sh_rtc_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops sh_rtc_dev_pm_ops = {
+static const struct dev_pm_ops sh_rtc_dev_pm_ops = {
 	.suspend = sh_rtc_suspend,
 	.suspend = sh_rtc_suspend,
 	.resume = sh_rtc_resume,
 	.resume = sh_rtc_resume,
 };
 };

+ 1 - 1
drivers/rtc/rtc-wm831x.c

@@ -485,7 +485,7 @@ static int __devexit wm831x_rtc_remove(struct platform_device *pdev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops wm831x_rtc_pm_ops = {
+static const struct dev_pm_ops wm831x_rtc_pm_ops = {
 	.suspend = wm831x_rtc_suspend,
 	.suspend = wm831x_rtc_suspend,
 	.resume = wm831x_rtc_resume,
 	.resume = wm831x_rtc_resume,
 
 

+ 1 - 1
drivers/s390/block/dcssblk.c

@@ -1005,7 +1005,7 @@ static int dcssblk_thaw(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops dcssblk_pm_ops = {
+static const struct dev_pm_ops dcssblk_pm_ops = {
 	.freeze		= dcssblk_freeze,
 	.freeze		= dcssblk_freeze,
 	.thaw		= dcssblk_thaw,
 	.thaw		= dcssblk_thaw,
 	.restore	= dcssblk_restore,
 	.restore	= dcssblk_restore,

+ 1 - 1
drivers/s390/block/xpram.c

@@ -407,7 +407,7 @@ static int xpram_restore(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops xpram_pm_ops = {
+static const struct dev_pm_ops xpram_pm_ops = {
 	.restore	= xpram_restore,
 	.restore	= xpram_restore,
 };
 };
 
 

+ 1 - 1
drivers/s390/char/monreader.c

@@ -529,7 +529,7 @@ static int monreader_restore(struct device *dev)
 	return monreader_thaw(dev);
 	return monreader_thaw(dev);
 }
 }
 
 
-static struct dev_pm_ops monreader_pm_ops = {
+static const struct dev_pm_ops monreader_pm_ops = {
 	.freeze  = monreader_freeze,
 	.freeze  = monreader_freeze,
 	.thaw	 = monreader_thaw,
 	.thaw	 = monreader_thaw,
 	.restore = monreader_restore,
 	.restore = monreader_restore,

+ 1 - 1
drivers/s390/char/monwriter.c

@@ -323,7 +323,7 @@ static int monwriter_thaw(struct device *dev)
 	return monwriter_restore(dev);
 	return monwriter_restore(dev);
 }
 }
 
 
-static struct dev_pm_ops monwriter_pm_ops = {
+static const struct dev_pm_ops monwriter_pm_ops = {
 	.freeze		= monwriter_freeze,
 	.freeze		= monwriter_freeze,
 	.thaw		= monwriter_thaw,
 	.thaw		= monwriter_thaw,
 	.restore	= monwriter_restore,
 	.restore	= monwriter_restore,

+ 1 - 1
drivers/s390/char/sclp.c

@@ -1019,7 +1019,7 @@ static int sclp_restore(struct device *dev)
 	return sclp_undo_suspend(SCLP_PM_EVENT_RESTORE);
 	return sclp_undo_suspend(SCLP_PM_EVENT_RESTORE);
 }
 }
 
 
-static struct dev_pm_ops sclp_pm_ops = {
+static const struct dev_pm_ops sclp_pm_ops = {
 	.freeze		= sclp_freeze,
 	.freeze		= sclp_freeze,
 	.thaw		= sclp_thaw,
 	.thaw		= sclp_thaw,
 	.restore	= sclp_restore,
 	.restore	= sclp_restore,

+ 1 - 1
drivers/s390/char/sclp_cmd.c

@@ -547,7 +547,7 @@ struct read_storage_sccb {
 	u32 entries[0];
 	u32 entries[0];
 } __packed;
 } __packed;
 
 
-static struct dev_pm_ops sclp_mem_pm_ops = {
+static const struct dev_pm_ops sclp_mem_pm_ops = {
 	.freeze		= sclp_mem_freeze,
 	.freeze		= sclp_mem_freeze,
 };
 };
 
 

+ 1 - 1
drivers/s390/char/vmlogrdr.c

@@ -675,7 +675,7 @@ static int vmlogrdr_pm_prepare(struct device *dev)
 }
 }
 
 
 
 
-static struct dev_pm_ops vmlogrdr_pm_ops = {
+static const struct dev_pm_ops vmlogrdr_pm_ops = {
 	.prepare = vmlogrdr_pm_prepare,
 	.prepare = vmlogrdr_pm_prepare,
 };
 };
 
 

+ 1 - 1
drivers/s390/cio/ccwgroup.c

@@ -560,7 +560,7 @@ static int ccwgroup_pm_restore(struct device *dev)
 	return gdrv->restore ? gdrv->restore(gdev) : 0;
 	return gdrv->restore ? gdrv->restore(gdev) : 0;
 }
 }
 
 
-static struct dev_pm_ops ccwgroup_pm_ops = {
+static const struct dev_pm_ops ccwgroup_pm_ops = {
 	.prepare = ccwgroup_pm_prepare,
 	.prepare = ccwgroup_pm_prepare,
 	.complete = ccwgroup_pm_complete,
 	.complete = ccwgroup_pm_complete,
 	.freeze = ccwgroup_pm_freeze,
 	.freeze = ccwgroup_pm_freeze,

+ 1 - 1
drivers/s390/cio/css.c

@@ -1148,7 +1148,7 @@ static int css_pm_restore(struct device *dev)
 	return drv->restore ? drv->restore(sch) : 0;
 	return drv->restore ? drv->restore(sch) : 0;
 }
 }
 
 
-static struct dev_pm_ops css_pm_ops = {
+static const struct dev_pm_ops css_pm_ops = {
 	.prepare = css_pm_prepare,
 	.prepare = css_pm_prepare,
 	.complete = css_pm_complete,
 	.complete = css_pm_complete,
 	.freeze = css_pm_freeze,
 	.freeze = css_pm_freeze,

+ 1 - 1
drivers/s390/cio/device.c

@@ -1904,7 +1904,7 @@ out_unlock:
 	return ret;
 	return ret;
 }
 }
 
 
-static struct dev_pm_ops ccw_pm_ops = {
+static const struct dev_pm_ops ccw_pm_ops = {
 	.prepare = ccw_device_pm_prepare,
 	.prepare = ccw_device_pm_prepare,
 	.complete = ccw_device_pm_complete,
 	.complete = ccw_device_pm_complete,
 	.freeze = ccw_device_pm_freeze,
 	.freeze = ccw_device_pm_freeze,

+ 1 - 1
drivers/s390/net/netiucv.c

@@ -159,7 +159,7 @@ static void netiucv_pm_complete(struct device *);
 static int netiucv_pm_freeze(struct device *);
 static int netiucv_pm_freeze(struct device *);
 static int netiucv_pm_restore_thaw(struct device *);
 static int netiucv_pm_restore_thaw(struct device *);
 
 
-static struct dev_pm_ops netiucv_pm_ops = {
+static const struct dev_pm_ops netiucv_pm_ops = {
 	.prepare = netiucv_pm_prepare,
 	.prepare = netiucv_pm_prepare,
 	.complete = netiucv_pm_complete,
 	.complete = netiucv_pm_complete,
 	.freeze = netiucv_pm_freeze,
 	.freeze = netiucv_pm_freeze,

+ 1 - 1
drivers/s390/net/smsgiucv.c

@@ -168,7 +168,7 @@ static int smsg_pm_restore_thaw(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops smsg_pm_ops = {
+static const struct dev_pm_ops smsg_pm_ops = {
 	.freeze = smsg_pm_freeze,
 	.freeze = smsg_pm_freeze,
 	.thaw = smsg_pm_restore_thaw,
 	.thaw = smsg_pm_restore_thaw,
 	.restore = smsg_pm_restore_thaw,
 	.restore = smsg_pm_restore_thaw,

+ 1 - 1
drivers/serial/pxa.c

@@ -756,7 +756,7 @@ static int serial_pxa_resume(struct device *dev)
         return 0;
         return 0;
 }
 }
 
 
-static struct dev_pm_ops serial_pxa_pm_ops = {
+static const struct dev_pm_ops serial_pxa_pm_ops = {
 	.suspend	= serial_pxa_suspend,
 	.suspend	= serial_pxa_suspend,
 	.resume		= serial_pxa_resume,
 	.resume		= serial_pxa_resume,
 };
 };

+ 1 - 1
drivers/serial/sh-sci.c

@@ -1312,7 +1312,7 @@ static int sci_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops sci_dev_pm_ops = {
+static const struct dev_pm_ops sci_dev_pm_ops = {
 	.suspend	= sci_suspend,
 	.suspend	= sci_suspend,
 	.resume		= sci_resume,
 	.resume		= sci_resume,
 };
 };

+ 1 - 1
drivers/spi/pxa2xx_spi.c

@@ -1709,7 +1709,7 @@ static int pxa2xx_spi_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops pxa2xx_spi_pm_ops = {
+static const struct dev_pm_ops pxa2xx_spi_pm_ops = {
 	.suspend	= pxa2xx_spi_suspend,
 	.suspend	= pxa2xx_spi_suspend,
 	.resume		= pxa2xx_spi_resume,
 	.resume		= pxa2xx_spi_resume,
 };
 };

+ 1 - 1
drivers/spi/spi_s3c24xx.c

@@ -489,7 +489,7 @@ static int s3c24xx_spi_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops s3c24xx_spi_pmops = {
+static const struct dev_pm_ops s3c24xx_spi_pmops = {
 	.suspend	= s3c24xx_spi_suspend,
 	.suspend	= s3c24xx_spi_suspend,
 	.resume		= s3c24xx_spi_resume,
 	.resume		= s3c24xx_spi_resume,
 };
 };

+ 1 - 1
drivers/uio/uio_pdrv_genirq.c

@@ -210,7 +210,7 @@ static int uio_pdrv_genirq_runtime_nop(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
+static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
 	.runtime_suspend = uio_pdrv_genirq_runtime_nop,
 	.runtime_suspend = uio_pdrv_genirq_runtime_nop,
 	.runtime_resume = uio_pdrv_genirq_runtime_nop,
 	.runtime_resume = uio_pdrv_genirq_runtime_nop,
 };
 };

+ 1 - 1
drivers/usb/core/hcd-pci.c

@@ -363,7 +363,7 @@ static int hcd_pci_restore(struct device *dev)
 	return resume_common(dev, true);
 	return resume_common(dev, true);
 }
 }
 
 
-struct dev_pm_ops usb_hcd_pci_pm_ops = {
+const struct dev_pm_ops usb_hcd_pci_pm_ops = {
 	.suspend	= hcd_pci_suspend,
 	.suspend	= hcd_pci_suspend,
 	.suspend_noirq	= hcd_pci_suspend_noirq,
 	.suspend_noirq	= hcd_pci_suspend_noirq,
 	.resume_noirq	= hcd_pci_resume_noirq,
 	.resume_noirq	= hcd_pci_resume_noirq,

+ 1 - 1
drivers/usb/core/hcd.h

@@ -330,7 +330,7 @@ extern void usb_hcd_pci_remove(struct pci_dev *dev);
 extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 
 
 #ifdef CONFIG_PM_SLEEP
 #ifdef CONFIG_PM_SLEEP
-extern struct dev_pm_ops	usb_hcd_pci_pm_ops;
+extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
 #endif
 #endif
 #endif /* CONFIG_PCI */
 #endif /* CONFIG_PCI */
 
 

+ 1 - 1
drivers/usb/core/usb.c

@@ -320,7 +320,7 @@ static int usb_dev_restore(struct device *dev)
 	return usb_resume(dev, PMSG_RESTORE);
 	return usb_resume(dev, PMSG_RESTORE);
 }
 }
 
 
-static struct dev_pm_ops usb_device_pm_ops = {
+static const struct dev_pm_ops usb_device_pm_ops = {
 	.prepare =	usb_dev_prepare,
 	.prepare =	usb_dev_prepare,
 	.complete =	usb_dev_complete,
 	.complete =	usb_dev_complete,
 	.suspend =	usb_dev_suspend,
 	.suspend =	usb_dev_suspend,

+ 1 - 1
drivers/usb/host/ehci-au1xxx.c

@@ -297,7 +297,7 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops au1xxx_ehci_pmops = {
+static const struct dev_pm_ops au1xxx_ehci_pmops = {
 	.suspend	= ehci_hcd_au1xxx_drv_suspend,
 	.suspend	= ehci_hcd_au1xxx_drv_suspend,
 	.resume		= ehci_hcd_au1xxx_drv_resume,
 	.resume		= ehci_hcd_au1xxx_drv_resume,
 };
 };

+ 1 - 1
drivers/usb/host/ohci-au1xxx.c

@@ -294,7 +294,7 @@ static int ohci_hcd_au1xxx_drv_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops au1xxx_ohci_pmops = {
+static const struct dev_pm_ops au1xxx_ohci_pmops = {
 	.suspend	= ohci_hcd_au1xxx_drv_suspend,
 	.suspend	= ohci_hcd_au1xxx_drv_suspend,
 	.resume		= ohci_hcd_au1xxx_drv_resume,
 	.resume		= ohci_hcd_au1xxx_drv_resume,
 };
 };

+ 1 - 1
drivers/usb/host/ohci-pxa27x.c

@@ -518,7 +518,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
+static const struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
 	.suspend	= ohci_hcd_pxa27x_drv_suspend,
 	.suspend	= ohci_hcd_pxa27x_drv_suspend,
 	.resume		= ohci_hcd_pxa27x_drv_resume,
 	.resume		= ohci_hcd_pxa27x_drv_resume,
 };
 };

+ 1 - 1
drivers/usb/host/r8a66597-hcd.c

@@ -2353,7 +2353,7 @@ static int r8a66597_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops r8a66597_dev_pm_ops = {
+static const struct dev_pm_ops r8a66597_dev_pm_ops = {
 	.suspend = r8a66597_suspend,
 	.suspend = r8a66597_suspend,
 	.resume = r8a66597_resume,
 	.resume = r8a66597_resume,
 	.poweroff = r8a66597_suspend,
 	.poweroff = r8a66597_suspend,

+ 1 - 1
drivers/usb/musb/musb_core.c

@@ -2214,7 +2214,7 @@ static int musb_resume_noirq(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops musb_dev_pm_ops = {
+static const struct dev_pm_ops musb_dev_pm_ops = {
 	.suspend	= musb_suspend,
 	.suspend	= musb_suspend,
 	.resume_noirq	= musb_resume_noirq,
 	.resume_noirq	= musb_resume_noirq,
 };
 };

+ 1 - 1
drivers/video/backlight/da903x_bl.c

@@ -177,7 +177,7 @@ static int da903x_backlight_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops da903x_backlight_pm_ops = {
+static const struct dev_pm_ops da903x_backlight_pm_ops = {
 	.suspend	= da903x_backlight_suspend,
 	.suspend	= da903x_backlight_suspend,
 	.resume		= da903x_backlight_resume,
 	.resume		= da903x_backlight_resume,
 };
 };

+ 1 - 1
drivers/video/hitfb.c

@@ -456,7 +456,7 @@ static int hitfb_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops hitfb_dev_pm_ops = {
+static const struct dev_pm_ops hitfb_dev_pm_ops = {
 	.suspend	= hitfb_suspend,
 	.suspend	= hitfb_suspend,
 	.resume		= hitfb_resume,
 	.resume		= hitfb_resume,
 };
 };

+ 1 - 1
drivers/video/pxafb.c

@@ -1667,7 +1667,7 @@ static int pxafb_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops pxafb_pm_ops = {
+static const struct dev_pm_ops pxafb_pm_ops = {
 	.suspend	= pxafb_suspend,
 	.suspend	= pxafb_suspend,
 	.resume		= pxafb_resume,
 	.resume		= pxafb_resume,
 };
 };

+ 1 - 1
drivers/video/sh_mobile_lcdcfb.c

@@ -890,7 +890,7 @@ static int sh_mobile_lcdc_runtime_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
+static const struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
 	.suspend = sh_mobile_lcdc_suspend,
 	.suspend = sh_mobile_lcdc_suspend,
 	.resume = sh_mobile_lcdc_resume,
 	.resume = sh_mobile_lcdc_resume,
 	.runtime_suspend = sh_mobile_lcdc_runtime_suspend,
 	.runtime_suspend = sh_mobile_lcdc_runtime_suspend,

+ 1 - 1
drivers/watchdog/adx_wdt.c

@@ -314,7 +314,7 @@ static int adx_wdt_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops adx_wdt_pm_ops = {
+static const struct dev_pm_ops adx_wdt_pm_ops = {
 	.suspend = adx_wdt_suspend,
 	.suspend = adx_wdt_suspend,
 	.resume = adx_wdt_resume,
 	.resume = adx_wdt_resume,
 };
 };

+ 1 - 1
include/linux/pm.h

@@ -219,7 +219,7 @@ struct dev_pm_ops {
  * to RAM and hibernation.
  * to RAM and hibernation.
  */
  */
 #define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
 #define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
-struct dev_pm_ops name = { \
+const struct dev_pm_ops name = { \
 	.suspend = suspend_fn, \
 	.suspend = suspend_fn, \
 	.resume = resume_fn, \
 	.resume = resume_fn, \
 	.freeze = suspend_fn, \
 	.freeze = suspend_fn, \

+ 1 - 1
net/iucv/af_iucv.c

@@ -221,7 +221,7 @@ static int afiucv_pm_restore_thaw(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops afiucv_pm_ops = {
+static const struct dev_pm_ops afiucv_pm_ops = {
 	.prepare = afiucv_pm_prepare,
 	.prepare = afiucv_pm_prepare,
 	.complete = afiucv_pm_complete,
 	.complete = afiucv_pm_complete,
 	.freeze = afiucv_pm_freeze,
 	.freeze = afiucv_pm_freeze,

+ 1 - 1
net/iucv/iucv.c

@@ -93,7 +93,7 @@ static int iucv_pm_freeze(struct device *);
 static int iucv_pm_thaw(struct device *);
 static int iucv_pm_thaw(struct device *);
 static int iucv_pm_restore(struct device *);
 static int iucv_pm_restore(struct device *);
 
 
-static struct dev_pm_ops iucv_pm_ops = {
+static const struct dev_pm_ops iucv_pm_ops = {
 	.prepare = iucv_pm_prepare,
 	.prepare = iucv_pm_prepare,
 	.complete = iucv_pm_complete,
 	.complete = iucv_pm_complete,
 	.freeze = iucv_pm_freeze,
 	.freeze = iucv_pm_freeze,

+ 1 - 1
sound/arm/pxa2xx-ac97.c

@@ -159,7 +159,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
 	return ret;
 	return ret;
 }
 }
 
 
-static struct dev_pm_ops pxa2xx_ac97_pm_ops = {
+static const struct dev_pm_ops pxa2xx_ac97_pm_ops = {
 	.suspend	= pxa2xx_ac97_suspend,
 	.suspend	= pxa2xx_ac97_suspend,
 	.resume		= pxa2xx_ac97_resume,
 	.resume		= pxa2xx_ac97_resume,
 };
 };

+ 1 - 1
sound/soc/s3c24xx/s3c24xx_simtec.c

@@ -312,7 +312,7 @@ int simtec_audio_resume(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-struct dev_pm_ops simtec_audio_pmops = {
+const struct dev_pm_ops simtec_audio_pmops = {
 	.resume	= simtec_audio_resume,
 	.resume	= simtec_audio_resume,
 };
 };
 EXPORT_SYMBOL_GPL(simtec_audio_pmops);
 EXPORT_SYMBOL_GPL(simtec_audio_pmops);

+ 1 - 1
sound/soc/s3c24xx/s3c24xx_simtec.h

@@ -15,7 +15,7 @@ extern int simtec_audio_core_probe(struct platform_device *pdev,
 extern int simtec_audio_remove(struct platform_device *pdev);
 extern int simtec_audio_remove(struct platform_device *pdev);
 
 
 #ifdef CONFIG_PM
 #ifdef CONFIG_PM
-extern struct dev_pm_ops simtec_audio_pmops;
+extern const struct dev_pm_ops simtec_audio_pmops;
 #define simtec_audio_pm &simtec_audio_pmops
 #define simtec_audio_pm &simtec_audio_pmops
 #else
 #else
 #define simtec_audio_pm NULL
 #define simtec_audio_pm NULL

+ 1 - 1
sound/soc/soc-core.c

@@ -1236,7 +1236,7 @@ static int soc_poweroff(struct device *dev)
 	return 0;
 	return 0;
 }
 }
 
 
-static struct dev_pm_ops soc_pm_ops = {
+static const struct dev_pm_ops soc_pm_ops = {
 	.suspend = soc_suspend,
 	.suspend = soc_suspend,
 	.resume = soc_resume,
 	.resume = soc_resume,
 	.poweroff = soc_poweroff,
 	.poweroff = soc_poweroff,