i2c-at91: Use struct dev_pm_ops for power management
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 19:22:47 +0000 (21:22 +0200)
committerWolfram Sang <w.sang@pengutronix.de>
Thu, 12 Jul 2012 10:04:32 +0000 (12:04 +0200)
Make the AT91 Two-Wire Interface driver define its PM callbacks
through a struct dev_pm_ops object rather than by using legacy PM
hooks in struct platform_driver.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
drivers/i2c/busses/i2c-at91.c

index 1679deef9c890131a951ee5cb8d50217ecb9bcf5..e24484beef078d9e3069b32066cd9c865ed25f22 100644 (file)
@@ -279,30 +279,31 @@ static int __devexit at91_i2c_remove(struct platform_device *pdev)
 
 /* NOTE: could save a few mA by keeping clock off outside of at91_xfer... */
 
-static int at91_i2c_suspend(struct platform_device *pdev, pm_message_t mesg)
+static int at91_i2c_suspend(struct device *dev)
 {
        clk_disable(twi_clk);
        return 0;
 }
 
-static int at91_i2c_resume(struct platform_device *pdev)
+static int at91_i2c_resume(struct device *dev)
 {
        return clk_enable(twi_clk);
 }
 
+static SIMPLE_DEV_PM_OPS(at91_i2c_pm, at91_i2c_suspend, at91_i2c_resume);
+#define AT91_I2C_PM    (&at91_i2c_pm)
+
 #else
-#define at91_i2c_suspend       NULL
-#define at91_i2c_resume                NULL
+#define AT91_I2C_PM    NULL
 #endif
 
 static struct platform_driver at91_i2c_driver = {
        .probe          = at91_i2c_probe,
        .remove         = __devexit_p(at91_i2c_remove),
-       .suspend        = at91_i2c_suspend,
-       .resume         = at91_i2c_resume,
        .driver         = {
                .name   = "at91_i2c",
                .owner  = THIS_MODULE,
+               .pm     = AT91_I2C_PM,
        },
 };