Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2726061 authored by Michal Simek's avatar Michal Simek Committed by Linus Torvalds
Browse files

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



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 0998d063 ("device-core:
Ensure drvdata = NULL when no driver is bound").

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c8b18da7

drivers/rtc/rtc-pl030.c

+0 −2
Original line number Diff line number Diff line
@@ -153,8 +153,6 @@ static int pl030_remove(struct amba_device *dev) 
{

	struct pl030_rtc *rtc = amba_get_drvdata(dev);



	amba_set_drvdata(dev, NULL);



	writel(0, rtc->base + RTC_CR);



	free_irq(dev->irq[0], rtc);

drivers/rtc/rtc-pl031.c

+0 −2
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static int pl031_remove(struct amba_device *adev) 
{

	struct pl031_local *ldata = dev_get_drvdata(&adev->dev);



	amba_set_drvdata(adev, NULL);

	free_irq(adev->irq[0], ldata);

	rtc_device_unregister(ldata->rtc);

	iounmap(ldata->base);
@@ -391,7 +390,6 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) 
	rtc_device_unregister(ldata->rtc);

out_no_rtc:

	iounmap(ldata->base);

	amba_set_drvdata(adev, NULL);

out_no_remap:

	kfree(ldata);

out: