Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

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

diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index bb3ba7b..e39e898 100644 (file)
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -334,7 +334,6 @@ static const struct rtc_class_ops at91_rtc_ops = {
  */
 static int at91_rtc_probe(struct platform_device *pdev)
 {
-       struct resource *r;
        struct sam9_rtc *rtc;
        int             ret, irq;
        u32             mr;
@@ -358,8 +357,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, rtc);
 
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       rtc->rtt = devm_ioremap_resource(&pdev->dev, r);
+       rtc->rtt = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(rtc->rtt))
                return PTR_ERR(rtc->rtt);