drivers/rtc/rtc-ds3232.c: use devm_* APIs

devm_* functions are device managed and make cleanup code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
index db0ca08db315e155089003e7043268bce63fba02..b83bb5a527f8f9de5709fd2e26feba8a34161283 100644 (file)
--- a/drivers/rtc/rtc-ds3232.c
+++ b/drivers/rtc/rtc-ds3232.c
@@ -397,7 +397,7 @@ static int ds3232_probe(struct i2c_client *client,
        struct ds3232 *ds3232;
        int ret;
 
-       ds3232 = kzalloc(sizeof(struct ds3232), GFP_KERNEL);
+       ds3232 = devm_kzalloc(&client->dev, sizeof(struct ds3232), GFP_KERNEL);
        if (!ds3232)
                return -ENOMEM;
 
@@ -409,34 +409,25 @@ static int ds3232_probe(struct i2c_client *client,
 
        ret = ds3232_check_rtc_status(client);
        if (ret)
-               goto out_free;
+               return ret;
 
-       ds3232->rtc = rtc_device_register(client->name, &client->dev,
+       ds3232->rtc = devm_rtc_device_register(&client->dev, client->name,
                                          &ds3232_rtc_ops, THIS_MODULE);
        if (IS_ERR(ds3232->rtc)) {
-               ret = PTR_ERR(ds3232->rtc);
                dev_err(&client->dev, "unable to register the class device\n");
-               goto out_irq;
+               return PTR_ERR(ds3232->rtc);
        }
 
        if (client->irq >= 0) {
-               ret = request_irq(client->irq, ds3232_irq, 0,
+               ret = devm_request_irq(&client->dev, client->irq, ds3232_irq, 0,
                                 "ds3232", client);
                if (ret) {
                        dev_err(&client->dev, "unable to request IRQ\n");
-                       goto out_free;
+                       return ret;
                }
        }
 
        return 0;
-
-out_irq:
-       if (client->irq >= 0)
-               free_irq(client->irq, client);
-
-out_free:
-       kfree(ds3232);
-       return ret;
 }
 
 static int ds3232_remove(struct i2c_client *client)
@@ -448,12 +439,10 @@ static int ds3232_remove(struct i2c_client *client)
                ds3232->exiting = 1;
                mutex_unlock(&ds3232->mutex);
 
-               free_irq(client->irq, client);
+               devm_free_irq(&client->dev, client->irq, client);
                cancel_work_sync(&ds3232->work);
        }
 
-       rtc_device_unregister(ds3232->rtc);
-       kfree(ds3232);
        return 0;
 }