OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtc: rtc-pcap: remove unnecessary platform_set_drvdata() 

The driver core clears the driver data to NULL after device_release or
on probe failure, since commit 0998d06310 ("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:32 -07:00 committed by Linus Torvalds
parent 6d4a38cbbb
commit a1c805a9bd
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/rtc/rtc-pcap.c
View File

@ -156,10 +156,8 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
pcap_rtc->rtc = devm_rtc_device_register(&pdev->dev, "pcap", pcap_rtc->rtc = devm_rtc_device_register(&pdev->dev, "pcap",
&pcap_rtc_ops, THIS_MODULE); &pcap_rtc_ops, THIS_MODULE);
if (IS_ERR(pcap_rtc->rtc)) { if (IS_ERR(pcap_rtc->rtc))
err = PTR_ERR(pcap_rtc->rtc); return PTR_ERR(pcap_rtc->rtc);
goto fail;
}
timer_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ); timer_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_1HZ);
alarm_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA); alarm_irq = pcap_to_irq(pcap_rtc->pcap, PCAP_IRQ_TODA);
@ -167,17 +165,14 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
err = devm_request_irq(&pdev->dev, timer_irq, pcap_rtc_irq, 0, err = devm_request_irq(&pdev->dev, timer_irq, pcap_rtc_irq, 0,
"RTC Timer", pcap_rtc); "RTC Timer", pcap_rtc);
if (err) if (err)
goto fail; return err;
err = devm_request_irq(&pdev->dev, alarm_irq, pcap_rtc_irq, 0, err = devm_request_irq(&pdev->dev, alarm_irq, pcap_rtc_irq, 0,
"RTC Alarm", pcap_rtc); "RTC Alarm", pcap_rtc);
if (err) if (err)
goto fail; return err;
return 0; return 0;
fail:
platform_set_drvdata(pdev, NULL);
return err;
} }
static int __exit pcap_rtc_remove(struct platform_device *pdev) static int __exit pcap_rtc_remove(struct platform_device *pdev)