]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Wed, 3 Jul 2013 22:06:33 +0000 (15:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 23:07:51 +0000 (16:07 -0700)
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>
drivers/rtc/rtc-pm8xxx.c

index f1a6557261f39c36a0dda30e68e5bd143e2a06e6..14ee860d5a3f6ddff2594c71a68982dfabcb8329 100644 (file)
@@ -480,7 +480,6 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
 fail_req_irq:
        rtc_device_unregister(rtc_dd->rtc);
 fail_rtc_enable:
-       platform_set_drvdata(pdev, NULL);
        kfree(rtc_dd);
        return rc;
 }
@@ -492,7 +491,6 @@ static int pm8xxx_rtc_remove(struct platform_device *pdev)
        device_init_wakeup(&pdev->dev, 0);
        free_irq(rtc_dd->rtc_alarm_irq, rtc_dd);
        rtc_device_unregister(rtc_dd->rtc);
-       platform_set_drvdata(pdev, NULL);
        kfree(rtc_dd);
 
        return 0;