drm/msm: Fix suspend/resume on i.MX5

[linux-2.6-microblaze.git] / drivers / rtc / rtc-ds1343.c

diff --git a/drivers/rtc/rtc-ds1343.c b/drivers/rtc/rtc-ds1343.c
index ba14342..f14ed6c 100644 (file)
--- a/drivers/rtc/rtc-ds1343.c
+++ b/drivers/rtc/rtc-ds1343.c
@@ -399,7 +399,6 @@ static int ds1343_probe(struct spi_device *spi)
        if (IS_ERR(priv->rtc))
                return PTR_ERR(priv->rtc);
 
-       priv->rtc->nvram_old_abi = true;
        priv->rtc->ops = &ds1343_rtc_ops;
        priv->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
        priv->rtc->range_max = RTC_TIMESTAMP_END_2099;
@@ -409,12 +408,12 @@ static int ds1343_probe(struct spi_device *spi)
                dev_err(&spi->dev,
                        "unable to create sysfs entries for rtc ds1343\n");
 
-       res = rtc_register_device(priv->rtc);
+       res = devm_rtc_register_device(priv->rtc);
        if (res)
                return res;
 
        nvmem_cfg.priv = priv;
-       rtc_nvmem_register(priv->rtc, &nvmem_cfg);
+       devm_rtc_nvmem_register(priv->rtc, &nvmem_cfg);
 
        priv->irq = spi->irq;