lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/rtc/rtc-pl03x.c: remove unnecessary amba_set_drvdata()

Browse Source 
Driver core clears the driver data to NULL after device_release or on
probe failure, so just remove it from here.

The relevant driver core change was commit 0998d06310 ("device-core:
Ensure drvdata = NULL when no driver is bound").

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michal Simek
2013-11-12 15:11:00 -08:00
committed by Linus Torvalds
parent c8b18da776
commit a272606192
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rtc/rtc-pl030.c
View File

@@ -153,8 +153,6 @@ static int pl030_remove(struct amba_device *dev)
{ {
struct pl030_rtc *rtc = amba_get_drvdata(dev); struct pl030_rtc *rtc = amba_get_drvdata(dev);
amba_set_drvdata(dev, NULL);
writel(0, rtc->base + RTC_CR); writel(0, rtc->base + RTC_CR);
free_irq(dev->irq[0], rtc); free_irq(dev->irq[0], rtc);

2
drivers/rtc/rtc-pl031.c
View File

@@ -305,7 +305,6 @@ static int pl031_remove(struct amba_device *adev)
{ {
struct pl031_local *ldata = dev_get_drvdata(&adev->dev); struct pl031_local *ldata = dev_get_drvdata(&adev->dev);
amba_set_drvdata(adev, NULL);
free_irq(adev->irq[0], ldata); free_irq(adev->irq[0], ldata);
rtc_device_unregister(ldata->rtc); rtc_device_unregister(ldata->rtc);
iounmap(ldata->base); iounmap(ldata->base);
@@ -391,7 +390,6 @@ out_no_irq:
rtc_device_unregister(ldata->rtc); rtc_device_unregister(ldata->rtc);
out_no_rtc: out_no_rtc:
iounmap(ldata->base); iounmap(ldata->base);
amba_set_drvdata(adev, NULL);
out_no_remap: out_no_remap:
kfree(ldata); kfree(ldata);
out: out: