Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 45713f0e7d61..f87780502b41 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1459,7 +1459,7 @@ static int __devexit sonypi_remove(struct platform_device *dev)
 #ifdef CONFIG_PM
 static int old_camera_power;
 
-static int sonypi_suspend(struct platform_device *dev, pm_message_t state)
+static int sonypi_suspend(struct device *dev)
 {
         old_camera_power = sonypi_device.camera_power;
         sonypi_disable();
@@ -1467,14 +1467,16 @@ static int sonypi_suspend(struct platform_device *dev, pm_message_t state)
         return 0;
 }
 
-static int sonypi_resume(struct platform_device *dev)
+static int sonypi_resume(struct device *dev)
 {
         sonypi_enable(old_camera_power);
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(sonypi_pm, sonypi_suspend, sonypi_resume);
+#define SONYPI_PM       (&sonypi_pm)
 #else
-#define sonypi_suspend  NULL
-#define sonypi_resume   NULL
+#define SONYPI_PM       NULL
 #endif
 
 static void sonypi_shutdown(struct platform_device *dev)
@@ -1486,12 +1488,11 @@ static struct platform_driver sonypi_driver = {
         .driver         = {
                 .name   = "sonypi",
                 .owner  = THIS_MODULE,
+                .pm     = SONYPI_PM,
         },
         .probe          = sonypi_probe,
         .remove         = __devexit_p(sonypi_remove),
         .shutdown       = sonypi_shutdown,
-        .suspend        = sonypi_suspend,
-        .resume         = sonypi_resume,
 };
 
 static struct platform_device *sonypi_platform_device;