aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-mxc.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-03 18:06:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:51 -0400
commitd2f3a3984be5b154714a16aeafe195883b4cd233 (patch)
tree24b4f652691139491f664fd6ee9ce28953a89711 /drivers/rtc/rtc-mxc.c
parente3aa7526fca757312732f88cd16f7a73a496b80d (diff)
rtc: rtc-mxc: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d063100 ("device-core: Ensure drvdata = NULL when no driver is bound"). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-mxc.c')
-rw-r--r--drivers/rtc/rtc-mxc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index bf00d6dbeadd..ab87bacb8f88 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -443,15 +443,13 @@ static int mxc_rtc_probe(struct platform_device *pdev)
443 THIS_MODULE); 443 THIS_MODULE);
444 if (IS_ERR(rtc)) { 444 if (IS_ERR(rtc)) {
445 ret = PTR_ERR(rtc); 445 ret = PTR_ERR(rtc);
446 goto exit_clr_drvdata; 446 goto exit_put_clk;
447 } 447 }
448 448
449 pdata->rtc = rtc; 449 pdata->rtc = rtc;
450 450
451 return 0; 451 return 0;
452 452
453exit_clr_drvdata:
454 platform_set_drvdata(pdev, NULL);
455exit_put_clk: 453exit_put_clk:
456 clk_disable_unprepare(pdata->clk); 454 clk_disable_unprepare(pdata->clk);
457 455
@@ -465,7 +463,6 @@ static int mxc_rtc_remove(struct platform_device *pdev)
465 struct rtc_plat_data *pdata = platform_get_drvdata(pdev); 463 struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
466 464
467 clk_disable_unprepare(pdata->clk); 465 clk_disable_unprepare(pdata->clk);
468 platform_set_drvdata(pdev, NULL);
469 466
470 return 0; 467 return 0;
471} 468}