Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / rtc / rtc-mxc.c

diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index 9a3895b..ab87bac 100644 (file)
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -436,22 +436,20 @@ static int mxc_rtc_probe(struct platform_device *pdev)
                pdata->irq = -1;
        }
 
-       if (pdata->irq >=0)
+       if (pdata->irq >= 0)
                device_init_wakeup(&pdev->dev, 1);
 
        rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &mxc_rtc_ops,
                                  THIS_MODULE);
        if (IS_ERR(rtc)) {
                ret = PTR_ERR(rtc);
-               goto exit_clr_drvdata;
+               goto exit_put_clk;
        }
 
        pdata->rtc = rtc;
 
        return 0;
 
-exit_clr_drvdata:
-       platform_set_drvdata(pdev, NULL);
 exit_put_clk:
        clk_disable_unprepare(pdata->clk);
 
@@ -465,7 +463,6 @@ static int mxc_rtc_remove(struct platform_device *pdev)
        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
        clk_disable_unprepare(pdata->clk);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }