Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...

[karo-tx-linux.git] / drivers / rtc / rtc-tile.c

diff --git a/drivers/rtc/rtc-tile.c b/drivers/rtc/rtc-tile.c
index 35dc926a6c5a498dcbeaf27dcdbf48a016f09e96..fc3dee95f16618a86ec59d86272947b27882500c 100644 (file)
--- a/drivers/rtc/rtc-tile.c
+++ b/drivers/rtc/rtc-tile.c
@@ -80,8 +80,8 @@ static int tile_rtc_probe(struct platform_device *dev)
 {
        struct rtc_device *rtc;
 
-       rtc = rtc_device_register("tile",
-                                 &dev->dev, &tile_rtc_ops, THIS_MODULE);
+       rtc = devm_rtc_device_register(&dev->dev, "tile",
+                               &tile_rtc_ops, THIS_MODULE);
 
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
@@ -96,11 +96,6 @@ static int tile_rtc_probe(struct platform_device *dev)
  */
 static int tile_rtc_remove(struct platform_device *dev)
 {
-       struct rtc_device *rtc = platform_get_drvdata(dev);
-
-       if (rtc)
-               rtc_device_unregister(rtc);
-
        platform_set_drvdata(dev, NULL);
 
        return 0;