Merge tag 'timers-v5.5-rc6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core

Pull clocksource/events driver updates from Daniel Lezcano

  - Add suspend/resume for Hyper-V clocksource (Dexuan Cui)

  - Fix Kconfig indentation (Krzysztof Kozlowski)

  - Add SoC specific bindings for RZ/G2N (r8a774b1) (Biju Das)

  - Add Microchip PIT64B support (Claudiu Beznea)

  - Convert the cadence ttc driver to a platform driver to initialize
    later (Rajan Vaja)

  - Fix a memory leak when the initialization fails on bcm2835 (Colin
    Ian King)

  - Use the combo devm_platform_ioremap_resource() function for em-sti,
    ti-dm and switch to platform_get_irq (Yangtao Li)

  - Fix Exynos naming in the driver (Krzysztof Kozlowski)

  - Fix an uninitialized pointer access in ti-dm timer (Tony Lindgren)

  - Fix a sparse warning in microchip-pit64b (Claudiu Beznea)

  - Code reorg without functional changes for Hyper-V clocksource
    (Andrea Parri)

  - Decrease the Hyper-V clocksource rating in order to let the stable
    TSC to be selected instead (Andrea Parri)

1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
index 5394d9dbdfbc..269a994d6a99 100644
--- 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);