diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-03 18:06:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:50 -0400 |
commit | 28e1de09421b0e21dffbf2186b5ef14c1c8e033c (patch) | |
tree | 95bff44316ff8809ed3925cce9c05bf0b05ef5cf | |
parent | 5f371582180572f06f74dcac55c54d2072e672bc (diff) |
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.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c index 7c90f4e45e27..981b6544cf7c 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) | |||
268 | if (ret < 0) { | 268 | if (ret < 0) { |
269 | dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n", | 269 | dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n", |
270 | info->irq, ret); | 270 | info->irq, ret); |
271 | goto err; | 271 | return ret; |
272 | } | 272 | } |
273 | 273 | ||
274 | dev_set_drvdata(&pdev->dev, info); | 274 | dev_set_drvdata(&pdev->dev, info); |
@@ -282,13 +282,10 @@ static int max8925_rtc_probe(struct platform_device *pdev) | |||
282 | ret = PTR_ERR(info->rtc_dev); | 282 | ret = PTR_ERR(info->rtc_dev); |
283 | if (IS_ERR(info->rtc_dev)) { | 283 | if (IS_ERR(info->rtc_dev)) { |
284 | dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); | 284 | dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); |
285 | goto err; | 285 | return ret; |
286 | } | 286 | } |
287 | 287 | ||
288 | return 0; | 288 | return 0; |
289 | err: | ||
290 | platform_set_drvdata(pdev, NULL); | ||
291 | return ret; | ||
292 | } | 289 | } |
293 | 290 | ||
294 | static int max8925_rtc_remove(struct platform_device *pdev) | 291 | static int max8925_rtc_remove(struct platform_device *pdev) |