summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-03 15:06:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:50 -0700
commit28e1de09421b0e21dffbf2186b5ef14c1c8e033c (patch)
tree95bff44316ff8809ed3925cce9c05bf0b05ef5cf
parent5f371582180572f06f74dcac55c54d2072e672bc (diff)
downloadop-kernel-dev-28e1de09421b0e21dffbf2186b5ef14c1c8e033c.zip
op-kernel-dev-28e1de09421b0e21dffbf2186b5ef14c1c8e033c.tar.gz
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 0998d063100 ("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: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-max8925.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 7c90f4e..981b654 100644
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -268,7 +268,7 @@ static int max8925_rtc_probe(struct platform_device *pdev)
if (ret < 0) {
dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
info->irq, ret);
- goto err;
+ return ret;
}
dev_set_drvdata(&pdev->dev, info);
@@ -282,13 +282,10 @@ static int max8925_rtc_probe(struct platform_device *pdev)
ret = PTR_ERR(info->rtc_dev);
if (IS_ERR(info->rtc_dev)) {
dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
- goto err;
+ return ret;
}
return 0;
-err:
- platform_set_drvdata(pdev, NULL);
- return ret;
}
static int max8925_rtc_remove(struct platform_device *pdev)
OpenPOWER on IntegriCloud