Merge tag 'for_v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux.git] / drivers / clocksource / timer-ti-dm.c

diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
index 5394d9dbdfbc633b4a9662dc1fbc09a2bfd40aed..269a994d6a99fddaf22a359d74a4f2f174d55681 100644 (file)
--- a/drivers/clocksource/timer-ti-dm.c
+++ b/drivers/clocksource/timer-ti-dm.c
@@ -780,7 +780,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 {
        unsigned long flags;
        struct omap_dm_timer *timer;
-       struct resource *mem, *irq;
        struct device *dev = &pdev->dev;
        const struct dmtimer_platform_data *pdata;
        int ret;
@@ -796,24 +795,16 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (unlikely(!irq)) {
-               dev_err(dev, "%s: no IRQ resource.\n", __func__);
-               return -ENODEV;
-       }
-
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (unlikely(!mem)) {
-               dev_err(dev, "%s: no memory resource.\n", __func__);
-               return -ENODEV;
-       }
-
        timer = devm_kzalloc(dev, sizeof(*timer), GFP_KERNEL);
        if (!timer)
                return  -ENOMEM;
 
+       timer->irq = platform_get_irq(pdev, 0);
+       if (timer->irq < 0)
+               return timer->irq;
+
        timer->fclk = ERR_PTR(-ENODEV);
-       timer->io_base = devm_ioremap_resource(dev, mem);
+       timer->io_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(timer->io_base))
                return PTR_ERR(timer->io_base);
 
@@ -836,7 +827,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
        if (pdata)
                timer->errata = pdata->timer_errata;
 
-       timer->irq = irq->start;
        timer->pdev = pdev;
 
        pm_runtime_enable(dev);