memstick: mspro_block: add missing curly braces

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

diff --git a/drivers/rtc/rtc-ds2404.c b/drivers/rtc/rtc-ds2404.c
index b04fc4272fb3c40ba191b5280c099bd7aacfa970..2ca5a23aba8a15c86baecbf0ec0d1417bd244cbb 100644 (file)
--- a/drivers/rtc/rtc-ds2404.c
+++ b/drivers/rtc/rtc-ds2404.c
@@ -228,7 +228,7 @@ static int rtc_probe(struct platform_device *pdev)
        struct ds2404 *chip;
        int retval = -EBUSY;
 
-       chip = kzalloc(sizeof(struct ds2404), GFP_KERNEL);
+       chip = devm_kzalloc(&pdev->dev, sizeof(struct ds2404), GFP_KERNEL);
        if (!chip)
                return -ENOMEM;
 
@@ -244,8 +244,8 @@ static int rtc_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, chip);
 
-       chip->rtc = rtc_device_register("ds2404",
-                               &pdev->dev, &ds2404_rtc_ops, THIS_MODULE);
+       chip->rtc = devm_rtc_device_register(&pdev->dev, "ds2404",
+                                       &ds2404_rtc_ops, THIS_MODULE);
        if (IS_ERR(chip->rtc)) {
                retval = PTR_ERR(chip->rtc);
                goto err_io;
@@ -257,20 +257,14 @@ static int rtc_probe(struct platform_device *pdev)
 err_io:
        chip->ops->unmap_io(chip);
 err_chip:
-       kfree(chip);
        return retval;
 }
 
 static int rtc_remove(struct platform_device *dev)
 {
        struct ds2404 *chip = platform_get_drvdata(dev);
-       struct rtc_device *rtc = chip->rtc;
-
-       if (rtc)
-               rtc_device_unregister(rtc);
 
        chip->ops->unmap_io(chip);
-       kfree(chip);
 
        return 0;
 }