[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157921026035.396.2699806927029482229.tip-bot2@tip-bot2>
Date: Thu, 16 Jan 2020 21:31:00 -0000
From: "tip-bot2 for Yangtao Li" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Yangtao Li <tiny.windzz@...il.com>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org>
Subject: [tip: timers/core] clocksource/drivers/timer-ti-dm: Switch to
platform_get_irq
The following commit has been merged into the timers/core branch of tip:
Commit-ID: bc83caddf17bd592cc19887e252c4ba416484d79
Gitweb: https://git.kernel.org/tip/bc83caddf17bd592cc19887e252c4ba416484d79
Author: Yangtao Li <tiny.windzz@...il.com>
AuthorDate: Sat, 21 Dec 2019 17:30:27
Committer: Daniel Lezcano <daniel.lezcano@...aro.org>
CommitterDate: Thu, 16 Jan 2020 19:06:57 +01:00
clocksource/drivers/timer-ti-dm: Switch to platform_get_irq
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@...il.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
Link: https://lore.kernel.org/r/20191221173027.30716-5-tiny.windzz@gmail.com
---
drivers/clocksource/timer-ti-dm.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c
index aa2ede2..bd16efb 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 *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);
Powered by blists - more mailing lists