]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clocksource/drivers/timer-ti-dm: Switch to platform_get_irq
authorYangtao Li <tiny.windzz@gmail.com>
Sat, 21 Dec 2019 17:30:27 +0000 (17:30 +0000)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Thu, 16 Jan 2020 18:06:57 +0000 (19:06 +0100)
platform_get_resource(pdev, IORESOURCE_IRQ) is not recommended for
requesting IRQ's resources, as they can be not ready yet. Using
platform_get_irq() instead is preferred for getting IRQ even if it
was not retrieved earlier.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20191221173027.30716-5-tiny.windzz@gmail.com
drivers/clocksource/timer-ti-dm.c

index aa2ede266edf229c23709a65e7e876e915c002f0..bd16efb2740b186f2c2a463612f157cde8ad6211 100644 (file)
@@ -780,7 +780,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 {
        unsigned long flags;
        struct omap_dm_timer *timer;
-       struct resource *irq;
        struct device *dev = &pdev->dev;
        const struct dmtimer_platform_data *pdata;
        int ret;
@@ -796,11 +795,9 @@ 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;
-       }
+       timer->irq = platform_get_irq(pdev, 0);
+       if (timer->irq < 0)
+               return timer->irq;
 
        timer = devm_kzalloc(dev, sizeof(*timer), GFP_KERNEL);
        if (!timer)
@@ -830,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);