diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-03 18:06:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:50 -0400 |
commit | 438831fc6ee66a34f27522ef3f0f9eac4b4da8bc (patch) | |
tree | f915d9aa259937cf50f55a8d64f8fb4d045cb56c /drivers/rtc/rtc-davinci.c | |
parent | 37dd5ffc35f41d85c1b8b9e1012c9fb891af3c05 (diff) |
rtc: rtc-davinci: 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>
Diffstat (limited to 'drivers/rtc/rtc-davinci.c')
-rw-r--r-- | drivers/rtc/rtc-davinci.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index be5fc32d3cd7..24677ef8c39a 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c | |||
@@ -526,10 +526,9 @@ static int __init davinci_rtc_probe(struct platform_device *pdev) | |||
526 | davinci_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, | 526 | davinci_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, |
527 | &davinci_rtc_ops, THIS_MODULE); | 527 | &davinci_rtc_ops, THIS_MODULE); |
528 | if (IS_ERR(davinci_rtc->rtc)) { | 528 | if (IS_ERR(davinci_rtc->rtc)) { |
529 | ret = PTR_ERR(davinci_rtc->rtc); | ||
530 | dev_err(dev, "unable to register RTC device, err %d\n", | 529 | dev_err(dev, "unable to register RTC device, err %d\n", |
531 | ret); | 530 | ret); |
532 | goto fail1; | 531 | return PTR_ERR(davinci_rtc->rtc); |
533 | } | 532 | } |
534 | 533 | ||
535 | rtcif_write(davinci_rtc, PRTCIF_INTFLG_RTCSS, PRTCIF_INTFLG); | 534 | rtcif_write(davinci_rtc, PRTCIF_INTFLG_RTCSS, PRTCIF_INTFLG); |
@@ -543,7 +542,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev) | |||
543 | 0, "davinci_rtc", davinci_rtc); | 542 | 0, "davinci_rtc", davinci_rtc); |
544 | if (ret < 0) { | 543 | if (ret < 0) { |
545 | dev_err(dev, "unable to register davinci RTC interrupt\n"); | 544 | dev_err(dev, "unable to register davinci RTC interrupt\n"); |
546 | goto fail1; | 545 | return ret; |
547 | } | 546 | } |
548 | 547 | ||
549 | /* Enable interrupts */ | 548 | /* Enable interrupts */ |
@@ -556,10 +555,6 @@ static int __init davinci_rtc_probe(struct platform_device *pdev) | |||
556 | device_init_wakeup(&pdev->dev, 0); | 555 | device_init_wakeup(&pdev->dev, 0); |
557 | 556 | ||
558 | return 0; | 557 | return 0; |
559 | |||
560 | fail1: | ||
561 | platform_set_drvdata(pdev, NULL); | ||
562 | return ret; | ||
563 | } | 558 | } |
564 | 559 | ||
565 | static int __exit davinci_rtc_remove(struct platform_device *pdev) | 560 | static int __exit davinci_rtc_remove(struct platform_device *pdev) |
@@ -570,8 +565,6 @@ static int __exit davinci_rtc_remove(struct platform_device *pdev) | |||
570 | 565 | ||
571 | rtcif_write(davinci_rtc, 0, PRTCIF_INTEN); | 566 | rtcif_write(davinci_rtc, 0, PRTCIF_INTEN); |
572 | 567 | ||
573 | platform_set_drvdata(pdev, NULL); | ||
574 | |||
575 | return 0; | 568 | return 0; |
576 | } | 569 | } |
577 | 570 | ||