2 files changed, 33 insertions, 17 deletions

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 762e1e530882..049555777f67 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1134,35 +1134,44 @@ static int __exit i2c_pxa_remove(struct platform_device *dev)
 }
 
 #ifdef CONFIG_PM
-static int i2c_pxa_suspend_late(struct platform_device *dev, pm_message_t state)
+static int i2c_pxa_suspend_noirq(struct device *dev)
 {
-        struct pxa_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct pxa_i2c *i2c = platform_get_drvdata(pdev);
+
         clk_disable(i2c->clk);
+
         return 0;
 }
 
-static int i2c_pxa_resume_early(struct platform_device *dev)
+static int i2c_pxa_resume_noirq(struct device *dev)
 {
-        struct pxa_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct pxa_i2c *i2c = platform_get_drvdata(pdev);
 
         clk_enable(i2c->clk);
         i2c_pxa_reset(i2c);
 
         return 0;
 }
+
+static struct dev_pm_ops i2c_pxa_dev_pm_ops = {
+        .suspend_noirq = i2c_pxa_suspend_noirq,
+        .resume_noirq = i2c_pxa_resume_noirq,
+};
+
+#define I2C_PXA_DEV_PM_OPS (&i2c_pxa_dev_pm_ops)
 #else
-#define i2c_pxa_suspend_late NULL
-#define i2c_pxa_resume_early NULL
+#define I2C_PXA_DEV_PM_OPS NULL
 #endif
 
 static struct platform_driver i2c_pxa_driver = {
         .probe          = i2c_pxa_probe,
         .remove         = __exit_p(i2c_pxa_remove),
-        .suspend_late   = i2c_pxa_suspend_late,
-        .resume_early   = i2c_pxa_resume_early,
         .driver         = {
                 .name   = "pxa2xx-i2c",
                 .owner  = THIS_MODULE,
+                .pm     = I2C_PXA_DEV_PM_OPS,
         },
         .id_table       = i2c_pxa_id_table,
 };
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 20bb0ceb027b..96aafb91b69a 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -946,17 +946,20 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int s3c24xx_i2c_suspend_late(struct platform_device *dev,
-                                    pm_message_t msg)
+static int s3c24xx_i2c_suspend_noirq(struct device *dev)
 {
-        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
+
         i2c->suspended = 1;
+
         return 0;
 }
 
-static int s3c24xx_i2c_resume(struct platform_device *dev)
+static int s3c24xx_i2c_resume(struct device *dev)
 {
-        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
 
         i2c->suspended = 0;
         s3c24xx_i2c_init(i2c);
@@ -964,9 +967,14 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
         return 0;
 }
 
+static struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {
+        .suspend_noirq = s3c24xx_i2c_suspend_noirq,
+        .resume = s3c24xx_i2c_resume,
+};
+
+#define S3C24XX_DEV_PM_OPS (&s3c24xx_i2c_dev_pm_ops)
 #else
-#define s3c24xx_i2c_suspend_late NULL
-#define s3c24xx_i2c_resume NULL
+#define S3C24XX_DEV_PM_OPS NULL
 #endif
 
 /* device driver for platform bus bits */
@@ -985,12 +993,11 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);
 static struct platform_driver s3c24xx_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
-        .suspend_late   = s3c24xx_i2c_suspend_late,
-        .resume         = s3c24xx_i2c_resume,
         .id_table       = s3c24xx_driver_ids,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "s3c-i2c",
+                .pm     = S3C24XX_DEV_PM_OPS,
         },
 };