Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into lsk-v3.10-arm64-misc

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-ds1374.c

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index fef76868aae069e1112c16619c502dd30fdc967a..94366e12f40fc0ccef7bce40f7dc9381fa72da98 100644 (file)
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -347,7 +347,7 @@ static int ds1374_probe(struct i2c_client *client,
        struct ds1374 *ds1374;
        int ret;
 
-       ds1374 = kzalloc(sizeof(struct ds1374), GFP_KERNEL);
+       ds1374 = devm_kzalloc(&client->dev, sizeof(struct ds1374), GFP_KERNEL);
        if (!ds1374)
                return -ENOMEM;
 
@@ -359,36 +359,27 @@ static int ds1374_probe(struct i2c_client *client,
 
        ret = ds1374_check_rtc_status(client);
        if (ret)
-               goto out_free;
+               return ret;
 
        if (client->irq > 0) {
-               ret = request_irq(client->irq, ds1374_irq, 0,
+               ret = devm_request_irq(&client->dev, client->irq, ds1374_irq, 0,
                                  "ds1374", client);
                if (ret) {
                        dev_err(&client->dev, "unable to request IRQ\n");
-                       goto out_free;
+                       return ret;
                }
 
                device_set_wakeup_capable(&client->dev, 1);
        }
 
-       ds1374->rtc = rtc_device_register(client->name, &client->dev,
+       ds1374->rtc = devm_rtc_device_register(&client->dev, client->name,
                                          &ds1374_rtc_ops, THIS_MODULE);
        if (IS_ERR(ds1374->rtc)) {
-               ret = PTR_ERR(ds1374->rtc);
                dev_err(&client->dev, "unable to register the class device\n");
-               goto out_irq;
+               return PTR_ERR(ds1374->rtc);
        }
 
        return 0;
-
-out_irq:
-       if (client->irq > 0)
-               free_irq(client->irq, client);
-
-out_free:
-       kfree(ds1374);
-       return ret;
 }
 
 static int ds1374_remove(struct i2c_client *client)
@@ -400,16 +391,14 @@ static int ds1374_remove(struct i2c_client *client)
                ds1374->exiting = 1;
                mutex_unlock(&ds1374->mutex);
 
-               free_irq(client->irq, client);
+               devm_free_irq(&client->dev, client->irq, client);
                cancel_work_sync(&ds1374->work);
        }
 
-       rtc_device_unregister(ds1374->rtc);
-       kfree(ds1374);
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ds1374_suspend(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
@@ -427,19 +416,15 @@ static int ds1374_resume(struct device *dev)
                disable_irq_wake(client->irq);
        return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(ds1374_pm, ds1374_suspend, ds1374_resume);
 
-#define DS1374_PM (&ds1374_pm)
-#else
-#define DS1374_PM NULL
-#endif
-
 static struct i2c_driver ds1374_driver = {
        .driver = {
                .name = "rtc-ds1374",
                .owner = THIS_MODULE,
-               .pm = DS1374_PM,
+               .pm = &ds1374_pm,
        },
        .probe = ds1374_probe,
        .remove = ds1374_remove,