1 files changed, 7 insertions, 19 deletions

diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index eccdc62ae1c0..17b73fdc3b6e 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -52,11 +52,9 @@
 #define RTC_BATT_FLAG           0x80
 
 struct rtc_plat_data {
-        struct rtc_device *rtc;
         void __iomem *ioaddr_nvram;
         void __iomem *ioaddr_rtc;
         size_t size_nvram;
-        size_t size;
         unsigned long last_jiffies;
         struct bin_attribute nvram_attr;
 };
@@ -117,11 +115,7 @@ static int ds1742_rtc_read_time(struct device *dev, struct rtc_time *tm)
         /* year is 1900 + tm->tm_year */
         tm->tm_year = bcd2bin(year) + bcd2bin(century) * 100 - 1900;
 
-        if (rtc_valid_tm(tm) < 0) {
-                dev_err(dev, "retrieved date/time is not valid.\n");
-                rtc_time_to_tm(0, tm);
-        }
-        return 0;
+        return rtc_valid_tm(tm);
 }
 
 static const struct rtc_class_ops ds1742_rtc_ops = {
@@ -168,22 +162,17 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
         void __iomem *ioaddr;
         int ret = 0;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -ENODEV;
         pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
-        pdata->size = resource_size(res);
-        if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
-                pdev->name))
-                return -EBUSY;
-        ioaddr = devm_ioremap(&pdev->dev, res->start, pdata->size);
-        if (!ioaddr)
-                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        ioaddr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(ioaddr))
+                return PTR_ERR(ioaddr);
 
         pdata->ioaddr_nvram = ioaddr;
-        pdata->size_nvram = pdata->size - RTC_SIZE;
+        pdata->size_nvram = resource_size(res) - RTC_SIZE;
         pdata->ioaddr_rtc = ioaddr + pdata->size_nvram;
 
         sysfs_bin_attr_init(&pdata->nvram_attr);
@@ -212,7 +201,6 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
                                   &ds1742_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc))
                 return PTR_ERR(rtc);
-        pdata->rtc = rtc;
 
         ret = sysfs_create_bin_file(&pdev->dev.kobj, &pdata->nvram_attr);