summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-03 15:06:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:51 -0700
commitd2f3a3984be5b154714a16aeafe195883b4cd233 (patch)
tree24b4f652691139491f664fd6ee9ce28953a89711
parente3aa7526fca757312732f88cd16f7a73a496b80d (diff)
downloadlinux-stable-d2f3a3984be5b154714a16aeafe195883b4cd233.tar.gz
linux-stable-d2f3a3984be5b154714a16aeafe195883b4cd233.tar.bz2
linux-stable-d2f3a3984be5b154714a16aeafe195883b4cd233.zip
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>
-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)
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;
}