1 files changed, 16 insertions, 17 deletions

diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 47f802bf1848..396b9d1b6bd6 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -283,27 +283,24 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
                 }
         }
 
-        tps65090->rmap = regmap_init_i2c(tps65090->client,
-                &tps65090_regmap_config);
+        tps65090->rmap = devm_regmap_init_i2c(tps65090->client,
+                                              &tps65090_regmap_config);
         if (IS_ERR(tps65090->rmap)) {
-                dev_err(&client->dev, "regmap_init failed with err: %ld\n",
-                        PTR_ERR(tps65090->rmap));
+                ret = PTR_ERR(tps65090->rmap);
+                dev_err(&client->dev, "regmap_init failed with err: %d\n", ret);
                 goto err_irq_exit;
-        };
+        }
 
         ret = mfd_add_devices(tps65090->dev, -1, tps65090s,
                 ARRAY_SIZE(tps65090s), NULL, 0);
         if (ret) {
                 dev_err(&client->dev, "add mfd devices failed with err: %d\n",
                         ret);
-                goto err_regmap_exit;
+                goto err_irq_exit;
         }
 
         return 0;
 
-err_regmap_exit:
-        regmap_exit(tps65090->rmap);
-
 err_irq_exit:
         if (client->irq)
                 free_irq(client->irq, tps65090);
@@ -316,29 +313,34 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client)
         struct tps65090 *tps65090 = i2c_get_clientdata(client);
 
         mfd_remove_devices(tps65090->dev);
-        regmap_exit(tps65090->rmap);
         if (client->irq)
                 free_irq(client->irq, tps65090);
 
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int tps65090_i2c_suspend(struct i2c_client *client, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int tps65090_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         if (client->irq)
                 disable_irq(client->irq);
         return 0;
 }
 
-static int tps65090_i2c_resume(struct i2c_client *client)
+static int tps65090_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
         if (client->irq)
                 enable_irq(client->irq);
         return 0;
 }
 #endif
 
+static const struct dev_pm_ops tps65090_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(tps65090_suspend, tps65090_resume)
+};
+
 static const struct i2c_device_id tps65090_id_table[] = {
         { "tps65090", 0 },
         { },
@@ -349,13 +351,10 @@ static struct i2c_driver tps65090_driver = {
         .driver = {
                 .name   = "tps65090",
                 .owner  = THIS_MODULE,
+                .pm     = &tps65090_pm_ops,
         },
         .probe          = tps65090_i2c_probe,
         .remove         = __devexit_p(tps65090_i2c_remove),
-#ifdef CONFIG_PM
-        .suspend        = tps65090_i2c_suspend,
-        .resume         = tps65090_i2c_resume,
-#endif
         .id_table       = tps65090_id_table,
 };