UPSTREAM: clk: rockchip: rk3036: fix uarts clock error

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

diff --git a/drivers/rtc/rtc-ricoh619.c b/drivers/rtc/rtc-ricoh619.c
index 9b16f28f28357548dd7e30f5faf8276efb7b4c8a..603fa1303b0e17654f6d5c6681af717db8e8d9b4 100755 (executable)
--- a/drivers/rtc/rtc-ricoh619.c
+++ b/drivers/rtc/rtc-ricoh619.c
@@ -750,7 +750,7 @@ static int ricoh619_rtc_probe(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 1);
        
 //     printk(KERN_INFO "PMU: %s register rtc device \n", __func__);
-       rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+       rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                       &ricoh619_rtc_ops, THIS_MODULE);
 
        // set interrupt and enable it
@@ -800,18 +800,11 @@ static int ricoh619_rtc_probe(struct platform_device *pdev)
        return 0;
 
 fail:
-       if (!IS_ERR_OR_NULL(rtc->rtc))
-               rtc_device_unregister(rtc->rtc);
-       kfree(rtc);
        return err;
 }
 
 static int ricoh619_rtc_remove(struct platform_device *pdev)
 {
-       struct ricoh619_rtc *rtc = dev_get_drvdata(&pdev->dev);
-
-       rtc_device_unregister(rtc->rtc);
-       kfree(rtc);
        return 0;
 }