i2c-au1550: dev_pm_ops conversion
authorManuel Lauss <manuel.lauss@googlemail.com>
Sat, 22 Oct 2011 11:34:39 +0000 (13:34 +0200)
committerBen Dooks <ben-linux@fluff.org>
Sat, 29 Oct 2011 10:14:28 +0000 (11:14 +0100)
use newer dev_pm_ops for PM

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
drivers/i2c/busses/i2c-au1550.c

index 4f5150c417a205dba7d5fc1d7e9cb19d67924bf7..4f757a2da8cc938f19f95eeb5d9d7859570a506e 100644 (file)
@@ -387,39 +387,43 @@ static int __devexit i2c_au1550_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int
-i2c_au1550_suspend(struct platform_device *pdev, pm_message_t state)
+static int i2c_au1550_suspend(struct device *dev)
 {
-       struct i2c_au1550_data *priv = platform_get_drvdata(pdev);
+       struct i2c_au1550_data *priv = dev_get_drvdata(dev);
 
        i2c_au1550_disable(priv);
 
        return 0;
 }
 
-static int
-i2c_au1550_resume(struct platform_device *pdev)
+static int i2c_au1550_resume(struct device *dev)
 {
-       struct i2c_au1550_data *priv = platform_get_drvdata(pdev);
+       struct i2c_au1550_data *priv = dev_get_drvdata(dev);
 
        i2c_au1550_setup(priv);
 
        return 0;
 }
+
+static const struct dev_pm_ops i2c_au1550_pmops = {
+       .suspend        = i2c_au1550_suspend,
+       .resume         = i2c_au1550_resume,
+};
+
+#define AU1XPSC_SMBUS_PMOPS (&i2c_au1550_pmops)
+
 #else
-#define i2c_au1550_suspend     NULL
-#define i2c_au1550_resume      NULL
+#define AU1XPSC_SMBUS_PMOPS NULL
 #endif
 
 static struct platform_driver au1xpsc_smbus_driver = {
        .driver = {
                .name   = "au1xpsc_smbus",
                .owner  = THIS_MODULE,
+               .pm     = AU1XPSC_SMBUS_PMOPS,
        },
        .probe          = i2c_au1550_probe,
        .remove         = __devexit_p(i2c_au1550_remove),
-       .suspend        = i2c_au1550_suspend,
-       .resume         = i2c_au1550_resume,
 };
 
 static int __init i2c_au1550_init(void)