Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rtc: rtc-s3c: remove unnecessary platform_set_drvdata()

Browse Source 
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>
This commit is contained in:
Jingoo Han 2013-07-03 15:06:34 -07:00 committed by Linus Torvalds
parent 253262a570
commit fb9b525e79
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/rtc/rtc-s3c.c
View File

@ -421,8 +421,6 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
static int s3c_rtc_remove(struct platform_device *dev) static int s3c_rtc_remove(struct platform_device *dev)
{ {
platform_set_drvdata(dev, NULL);
s3c_rtc_setaie(&dev->dev, 0); s3c_rtc_setaie(&dev->dev, 0);
clk_unprepare(rtc_clk); clk_unprepare(rtc_clk);
@ -549,23 +547,20 @@ static int s3c_rtc_probe(struct platform_device *pdev)
0, "s3c2410-rtc alarm", rtc); 0, "s3c2410-rtc alarm", rtc);
if (ret) { if (ret) {
dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
goto err_alarm_irq; goto err_nortc;
} }
ret = devm_request_irq(&pdev->dev, s3c_rtc_tickno, s3c_rtc_tickirq, ret = devm_request_irq(&pdev->dev, s3c_rtc_tickno, s3c_rtc_tickirq,
0, "s3c2410-rtc tick", rtc); 0, "s3c2410-rtc tick", rtc);
if (ret) { if (ret) {
dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
goto err_alarm_irq; goto err_nortc;
} }
clk_disable(rtc_clk); clk_disable(rtc_clk);
return 0; return 0;
err_alarm_irq:
platform_set_drvdata(pdev, NULL);
err_nortc: err_nortc:
s3c_rtc_enable(pdev, 0); s3c_rtc_enable(pdev, 0);
clk_disable_unprepare(rtc_clk); clk_disable_unprepare(rtc_clk);