Commit 61cc483a authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release or
on probe failure, since commit 0998d063 ("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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d772d34
...@@ -324,16 +324,14 @@ static int at91_rtc_probe(struct platform_device *pdev) ...@@ -324,16 +324,14 @@ static int at91_rtc_probe(struct platform_device *pdev)
rtc->rtt = devm_ioremap(&pdev->dev, r->start, resource_size(r)); rtc->rtt = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!rtc->rtt) { if (!rtc->rtt) {
dev_err(&pdev->dev, "failed to map registers, aborting.\n"); dev_err(&pdev->dev, "failed to map registers, aborting.\n");
ret = -ENOMEM; return -ENOMEM;
goto fail;
} }
rtc->gpbr = devm_ioremap(&pdev->dev, r_gpbr->start, rtc->gpbr = devm_ioremap(&pdev->dev, r_gpbr->start,
resource_size(r_gpbr)); resource_size(r_gpbr));
if (!rtc->gpbr) { if (!rtc->gpbr) {
dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n"); dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n");
ret = -ENOMEM; return -ENOMEM;
goto fail;
} }
mr = rtt_readl(rtc, MR); mr = rtt_readl(rtc, MR);
...@@ -350,17 +348,15 @@ static int at91_rtc_probe(struct platform_device *pdev) ...@@ -350,17 +348,15 @@ static int at91_rtc_probe(struct platform_device *pdev)
rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name, rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,
&at91_rtc_ops, THIS_MODULE); &at91_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtcdev)) { if (IS_ERR(rtc->rtcdev))
ret = PTR_ERR(rtc->rtcdev); return PTR_ERR(rtc->rtcdev);
goto fail;
}
/* register irq handler after we know what name we'll use */ /* register irq handler after we know what name we'll use */
ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt, ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,
IRQF_SHARED, dev_name(&rtc->rtcdev->dev), rtc); IRQF_SHARED, dev_name(&rtc->rtcdev->dev), rtc);
if (ret) { if (ret) {
dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq); dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq);
goto fail; return ret;
} }
/* NOTE: sam9260 rev A silicon has a ROM bug which resets the /* NOTE: sam9260 rev A silicon has a ROM bug which resets the
...@@ -374,10 +370,6 @@ static int at91_rtc_probe(struct platform_device *pdev) ...@@ -374,10 +370,6 @@ static int at91_rtc_probe(struct platform_device *pdev)
dev_name(&rtc->rtcdev->dev)); dev_name(&rtc->rtcdev->dev));
return 0; return 0;
fail:
platform_set_drvdata(pdev, NULL);
return ret;
} }
/* /*
...@@ -391,7 +383,6 @@ static int at91_rtc_remove(struct platform_device *pdev) ...@@ -391,7 +383,6 @@ static int at91_rtc_remove(struct platform_device *pdev)
/* disable all interrupts */ /* disable all interrupts */
rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN)); rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN));
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment