1 files changed, 21 insertions, 57 deletions

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index a7a2a998fa91..fb994e9ddc15 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -47,8 +47,6 @@ struct s3c_rtc_drv_data {
 /* I have yet to find an S3C implementation with more than one
  * of these rtc blocks in */
 
-static struct resource *s3c_rtc_mem;
-
 static struct clk *rtc_clk;
 static void __iomem *s3c_rtc_base;
 static int s3c_rtc_alarmno = NO_IRQ;
@@ -117,7 +115,7 @@ static int s3c_rtc_setaie(struct device *dev, unsigned int enabled)
 {
         unsigned int tmp;
 
-        pr_debug("%s: aie=%d\n", __func__, enabled);
+        dev_dbg(dev, "%s: aie=%d\n", __func__, enabled);
 
         clk_enable(rtc_clk);
         tmp = readb(s3c_rtc_base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN;
@@ -205,7 +203,7 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
 
         rtc_tm->tm_year += 100;
 
-        pr_debug("read time %04d.%02d.%02d %02d:%02d:%02d\n",
+        dev_dbg(dev, "read time %04d.%02d.%02d %02d:%02d:%02d\n",
                  1900 + rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday,
                  rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec);
 
@@ -220,7 +218,7 @@ static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
         void __iomem *base = s3c_rtc_base;
         int year = tm->tm_year - 100;
 
-        pr_debug("set time %04d.%02d.%02d %02d:%02d:%02d\n",
+        dev_dbg(dev, "set time %04d.%02d.%02d %02d:%02d:%02d\n",
                  1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
                  tm->tm_hour, tm->tm_min, tm->tm_sec);
 
@@ -261,7 +259,7 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0;
 
-        pr_debug("read alarm %d, %04d.%02d.%02d %02d:%02d:%02d\n",
+        dev_dbg(dev, "read alarm %d, %04d.%02d.%02d %02d:%02d:%02d\n",
                  alm_en,
                  1900 + alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
                  alm_tm->tm_hour, alm_tm->tm_min, alm_tm->tm_sec);
@@ -312,7 +310,7 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         unsigned int alrm_en;
 
         clk_enable(rtc_clk);
-        pr_debug("s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n",
+        dev_dbg(dev, "s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n",
                  alrm->enabled,
                  1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
                  tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -335,7 +333,7 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
                 writeb(bin2bcd(tm->tm_hour), base + S3C2410_ALMHOUR);
         }
 
-        pr_debug("setting S3C2410_RTCALM to %08x\n", alrm_en);
+        dev_dbg(dev, "setting S3C2410_RTCALM to %08x\n", alrm_en);
 
         writeb(alrm_en, base + S3C2410_RTCALM);
 
@@ -423,25 +421,17 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
         clk_disable(rtc_clk);
 }
 
-static int __devexit s3c_rtc_remove(struct platform_device *dev)
+static int s3c_rtc_remove(struct platform_device *dev)
 {
         struct rtc_device *rtc = platform_get_drvdata(dev);
 
-        free_irq(s3c_rtc_alarmno, rtc);
-        free_irq(s3c_rtc_tickno, rtc);
-
         platform_set_drvdata(dev, NULL);
         rtc_device_unregister(rtc);
 
         s3c_rtc_setaie(&dev->dev, 0);
 
-        clk_put(rtc_clk);
         rtc_clk = NULL;
 
-        iounmap(s3c_rtc_base);
-        release_resource(s3c_rtc_mem);
-        kfree(s3c_rtc_mem);
-
         return 0;
 }
 
@@ -461,7 +451,7 @@ static inline int s3c_rtc_get_driver_data(struct platform_device *pdev)
         return platform_get_device_id(pdev)->driver_data;
 }
 
-static int __devinit s3c_rtc_probe(struct platform_device *pdev)
+static int s3c_rtc_probe(struct platform_device *pdev)
 {
         struct rtc_device *rtc;
         struct rtc_time rtc_tm;
@@ -469,7 +459,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
         int ret;
         int tmp;
 
-        pr_debug("%s: probe=%p\n", __func__, pdev);
+        dev_dbg(&pdev->dev, "%s: probe=%p\n", __func__, pdev);
 
         /* find the IRQs */
 
@@ -485,7 +475,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 return s3c_rtc_alarmno;
         }
 
-        pr_debug("s3c2410_rtc: tick irq %d, alarm irq %d\n",
+        dev_dbg(&pdev->dev, "s3c2410_rtc: tick irq %d, alarm irq %d\n",
                  s3c_rtc_tickno, s3c_rtc_alarmno);
 
         /* get the memory region */
@@ -496,28 +486,16 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        s3c_rtc_mem = request_mem_region(res->start, resource_size(res),
-                                         pdev->name);
-
-        if (s3c_rtc_mem == NULL) {
-                dev_err(&pdev->dev, "failed to reserve memory region\n");
-                ret = -ENOENT;
-                goto err_nores;
-        }
-
-        s3c_rtc_base = ioremap(res->start, resource_size(res));
-        if (s3c_rtc_base == NULL) {
-                dev_err(&pdev->dev, "failed ioremap()\n");
-                ret = -EINVAL;
-                goto err_nomap;
-        }
+        s3c_rtc_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(s3c_rtc_base))
+                return PTR_ERR(s3c_rtc_base);
 
-        rtc_clk = clk_get(&pdev->dev, "rtc");
+        rtc_clk = devm_clk_get(&pdev->dev, "rtc");
         if (IS_ERR(rtc_clk)) {
                 dev_err(&pdev->dev, "failed to find rtc clock source\n");
                 ret = PTR_ERR(rtc_clk);
                 rtc_clk = NULL;
-                goto err_clk;
+                return ret;
         }
 
         clk_enable(rtc_clk);
@@ -526,7 +504,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 
         s3c_rtc_enable(pdev, 1);
 
-        pr_debug("s3c2410_rtc: RTCCON=%02x\n",
+        dev_dbg(&pdev->dev, "s3c2410_rtc: RTCCON=%02x\n",
                  readw(s3c_rtc_base + S3C2410_RTCCON));
 
         device_init_wakeup(&pdev->dev, 1);
@@ -576,28 +554,24 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 
         s3c_rtc_setfreq(&pdev->dev, 1);
 
-        ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
+        ret = devm_request_irq(&pdev->dev, s3c_rtc_alarmno, s3c_rtc_alarmirq,
                           0,  "s3c2410-rtc alarm", rtc);
         if (ret) {
                 dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
                 goto err_alarm_irq;
         }
 
-        ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
+        ret = devm_request_irq(&pdev->dev, s3c_rtc_tickno, s3c_rtc_tickirq,
                           0,  "s3c2410-rtc tick", rtc);
         if (ret) {
                 dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
-                free_irq(s3c_rtc_alarmno, rtc);
-                goto err_tick_irq;
+                goto err_alarm_irq;
         }
 
         clk_disable(rtc_clk);
 
         return 0;
 
- err_tick_irq:
-        free_irq(s3c_rtc_alarmno, rtc);
-
  err_alarm_irq:
         platform_set_drvdata(pdev, NULL);
         rtc_device_unregister(rtc);
@@ -605,15 +579,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
  err_nortc:
         s3c_rtc_enable(pdev, 0);
         clk_disable(rtc_clk);
-        clk_put(rtc_clk);
 
- err_clk:
-        iounmap(s3c_rtc_base);
-
- err_nomap:
-        release_resource(s3c_rtc_mem);
-
- err_nores:
         return ret;
 }
 
@@ -695,8 +661,6 @@ static const struct of_device_id s3c_rtc_dt_match[] = {
         {},
 };
 MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
-#else
-#define s3c_rtc_dt_match NULL
 #endif
 
 static struct platform_device_id s3c_rtc_driver_ids[] = {
@@ -720,14 +684,14 @@ MODULE_DEVICE_TABLE(platform, s3c_rtc_driver_ids);
 
 static struct platform_driver s3c_rtc_driver = {
         .probe          = s3c_rtc_probe,
-        .remove         = __devexit_p(s3c_rtc_remove),
+        .remove         = s3c_rtc_remove,
         .suspend        = s3c_rtc_suspend,
         .resume         = s3c_rtc_resume,
         .id_table       = s3c_rtc_driver_ids,
         .driver         = {
                 .name   = "s3c-rtc",
                 .owner  = THIS_MODULE,
-                .of_match_table = s3c_rtc_dt_match,
+                .of_match_table = of_match_ptr(s3c_rtc_dt_match),
         },
 };