drm/i915/display: Use external dependency loop for port sync

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

diff --git a/drivers/rtc/rtc-meson.c b/drivers/rtc/rtc-meson.c
index e08b981..47ebcf8 100644 (file)
--- a/drivers/rtc/rtc-meson.c
+++ b/drivers/rtc/rtc-meson.c
@@ -131,7 +131,7 @@ static u32 meson_rtc_get_data(struct meson_rtc *rtc)
 
 static int meson_rtc_get_bus(struct meson_rtc *rtc)
 {
-       int ret, retries = 3;
+       int ret, retries;
        u32 val;
 
        /* prepare bus for transfers, set all lines low */
@@ -292,7 +292,6 @@ static int meson_rtc_probe(struct platform_device *pdev)
        };
        struct device *dev = &pdev->dev;
        struct meson_rtc *rtc;
-       struct resource *res;
        void __iomem *base;
        int ret;
        u32 tm;
@@ -312,8 +311,7 @@ static int meson_rtc_probe(struct platform_device *pdev)
        rtc->rtc->ops = &meson_rtc_ops;
        rtc->rtc->range_max = U32_MAX;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       base = devm_ioremap_resource(dev, res);
+       base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(base))
                return PTR_ERR(base);