Commit 46aee0c7 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

rtc: rtc-at32ap700x: 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 431296a4
...@@ -212,23 +212,20 @@ static int __init at32_rtc_probe(struct platform_device *pdev) ...@@ -212,23 +212,20 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!regs) { if (!regs) {
dev_dbg(&pdev->dev, "no mmio resource defined\n"); dev_dbg(&pdev->dev, "no mmio resource defined\n");
ret = -ENXIO; return -ENXIO;
goto out;
} }
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq <= 0) { if (irq <= 0) {
dev_dbg(&pdev->dev, "could not get irq\n"); dev_dbg(&pdev->dev, "could not get irq\n");
ret = -ENXIO; return -ENXIO;
goto out;
} }
rtc->irq = irq; rtc->irq = irq;
rtc->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs)); rtc->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));
if (!rtc->regs) { if (!rtc->regs) {
ret = -ENOMEM;
dev_dbg(&pdev->dev, "could not map I/O memory\n"); dev_dbg(&pdev->dev, "could not map I/O memory\n");
goto out; return -ENOMEM;
} }
spin_lock_init(&rtc->lock); spin_lock_init(&rtc->lock);
...@@ -249,7 +246,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev) ...@@ -249,7 +246,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
"rtc", rtc); "rtc", rtc);
if (ret) { if (ret) {
dev_dbg(&pdev->dev, "could not request irq %d\n", irq); dev_dbg(&pdev->dev, "could not request irq %d\n", irq);
goto out; return ret;
} }
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
...@@ -258,8 +255,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev) ...@@ -258,8 +255,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
&at32_rtc_ops, THIS_MODULE); &at32_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc)) { if (IS_ERR(rtc->rtc)) {
dev_dbg(&pdev->dev, "could not register rtc device\n"); dev_dbg(&pdev->dev, "could not register rtc device\n");
ret = PTR_ERR(rtc->rtc); return PTR_ERR(rtc->rtc);
goto out;
} }
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
...@@ -268,18 +264,12 @@ static int __init at32_rtc_probe(struct platform_device *pdev) ...@@ -268,18 +264,12 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
(unsigned long)rtc->regs, rtc->irq); (unsigned long)rtc->regs, rtc->irq);
return 0; return 0;
out:
platform_set_drvdata(pdev, NULL);
return ret;
} }
static int __exit at32_rtc_remove(struct platform_device *pdev) static int __exit at32_rtc_remove(struct platform_device *pdev)
{ {
device_init_wakeup(&pdev->dev, 0); device_init_wakeup(&pdev->dev, 0);
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