1 files changed, 4 insertions, 19 deletions

diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index 2643d8874925..7a8ed27a5f2e 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -316,7 +316,7 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
         struct mc13xxx *mc13xxx;
         int rtcrst_pending;
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
@@ -351,8 +351,8 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
 
         mc13xxx_unlock(mc13xxx);
 
-        priv->rtc = rtc_device_register(pdev->name,
-                        &pdev->dev, &mc13xxx_rtc_ops, THIS_MODULE);
+        priv->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+                                        &mc13xxx_rtc_ops, THIS_MODULE);
         if (IS_ERR(priv->rtc)) {
                 ret = PTR_ERR(priv->rtc);
 
@@ -372,7 +372,6 @@ err_reset_irq_request:
                 mc13xxx_unlock(mc13xxx);
 
                 platform_set_drvdata(pdev, NULL);
-                kfree(priv);
         }
 
         return ret;
@@ -384,8 +383,6 @@ static int __exit mc13xxx_rtc_remove(struct platform_device *pdev)
 
         mc13xxx_lock(priv->mc13xxx);
 
-        rtc_device_unregister(priv->rtc);
-
         mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TODA, priv);
         mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_1HZ, priv);
         mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_RTCRST, priv);
@@ -394,8 +391,6 @@ static int __exit mc13xxx_rtc_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
 
-        kfree(priv);
-
         return 0;
 }
 
@@ -420,17 +415,7 @@ static struct platform_driver mc13xxx_rtc_driver = {
         },
 };
 
-static int __init mc13xxx_rtc_init(void)
-{
-        return platform_driver_probe(&mc13xxx_rtc_driver, &mc13xxx_rtc_probe);
-}
-module_init(mc13xxx_rtc_init);
-
-static void __exit mc13xxx_rtc_exit(void)
-{
-        platform_driver_unregister(&mc13xxx_rtc_driver);
-}
-module_exit(mc13xxx_rtc_exit);
+module_platform_driver_probe(mc13xxx_rtc_driver, &mc13xxx_rtc_probe);
 
 MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
 MODULE_DESCRIPTION("RTC driver for Freescale MC13XXX PMIC");