Merge tag 'kvm-3.10-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-block.git] / drivers / rtc / rtc-dm355evm.c

diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
index b2ed2c94b081b12f88a2e7f43e3541103a3c72ca..1e1ca63d58a9dd67c6a19e3dc99a0394da1646c3 100644 (file)
--- a/drivers/rtc/rtc-dm355evm.c
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -127,8 +127,8 @@ static int dm355evm_rtc_probe(struct platform_device *pdev)
 {
        struct rtc_device *rtc;
 
-       rtc = rtc_device_register(pdev->name,
-                                 &pdev->dev, &dm355evm_rtc_ops, THIS_MODULE);
+       rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+                                       &dm355evm_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc)) {
                dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
                        PTR_ERR(rtc));
@@ -141,9 +141,6 @@ static int dm355evm_rtc_probe(struct platform_device *pdev)
 
 static int dm355evm_rtc_remove(struct platform_device *pdev)
 {
-       struct rtc_device *rtc = platform_get_drvdata(pdev);
-
-       rtc_device_unregister(rtc);
        platform_set_drvdata(pdev, NULL);
        return 0;
 }