Commit 28e1de09 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

rtc: rtc-max8925: 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 5f371582
...@@ -268,7 +268,7 @@ static int max8925_rtc_probe(struct platform_device *pdev) ...@@ -268,7 +268,7 @@ static int max8925_rtc_probe(struct platform_device *pdev)
if (ret < 0) { if (ret < 0) {
dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n", dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
info->irq, ret); info->irq, ret);
goto err; return ret;
} }
dev_set_drvdata(&pdev->dev, info); dev_set_drvdata(&pdev->dev, info);
...@@ -282,13 +282,10 @@ static int max8925_rtc_probe(struct platform_device *pdev) ...@@ -282,13 +282,10 @@ static int max8925_rtc_probe(struct platform_device *pdev)
ret = PTR_ERR(info->rtc_dev); ret = PTR_ERR(info->rtc_dev);
if (IS_ERR(info->rtc_dev)) { if (IS_ERR(info->rtc_dev)) {
dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
goto err; return ret;
} }
return 0; return 0;
err:
platform_set_drvdata(pdev, NULL);
return ret;
} }
static int max8925_rtc_remove(struct platform_device *pdev) static int max8925_rtc_remove(struct platform_device *pdev)
......
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