summaryrefslogtreecommitdiff
path: root/drivers/clocksource/timer-nxp-stm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-08-18 16:20:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2026-08-18 16:20:25 -0700
commitb0239dd672306ad242545f793132938847f17e53 (patch)
tree62c21cd60ad99120fa21855831ef7a1f466cd33b /drivers/clocksource/timer-nxp-stm.c
parent030c9f813b8e48d2b066983c94cf6294968f9496 (diff)
parent0eaed89c18aeedf0898baf2dbf5ff027c6795152 (diff)
Merge tag 'timers-clocksource-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull clocksource/event driver updates from Thomas Gleixner: - Remove redundant dev_err() and dev_err_probe() invocations in various drivers - Handle SWAP_IO_SPACE correctly in the rtl-otto driver - Make the Samsumg PWM timer driver PREEMPT_RT compatible - Ensure that the SUN4I timer is programmed with a delta larger than zero as a zero delta causes the the timer to be disabled - The usual fixes and improvements all over the place * tag 'timers-clocksource-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource/drivers/armada: Unwind timer clock on init failure clocksource/drivers/rtl-otto: Change driver to use __raw reads and writes clocksource/drivers/samsung_pwm: Switch to raw_spinlock_t type clocksource/drivers/clps711x: Do not unmap clocksource MMIO clocksource/drivers/nxp-pit: Fix IRQ leak on cpuhp_setup_state error path clocksource/drivers/timer-sun4i: Advertise a real minimum delta clocksource: Remove redundant dev_err()/dev_err_probe() clocksource/drivers/sh_cmt: Use named initializers for platform_device_id arrays clocksource/drivers/sh_mtu2: Drop unused assignment of platform_device_id
Diffstat (limited to 'drivers/clocksource/timer-nxp-stm.c')
-rw-r--r--drivers/clocksource/timer-nxp-stm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-nxp-stm.c b/drivers/clocksource/timer-nxp-stm.c
index 1ab907233f48..6fe098a4a33f 100644
--- a/drivers/clocksource/timer-nxp-stm.c
+++ b/drivers/clocksource/timer-nxp-stm.c
@@ -441,7 +441,7 @@ static int nxp_stm_timer_probe(struct platform_device *pdev)
ret = devm_request_irq(dev, irq, nxp_stm_module_interrupt,
IRQF_TIMER | IRQF_NOBALANCING, name, stm_timer);
if (ret)
- return dev_err_probe(dev, ret, "Unable to allocate interrupt line\n");
+ return ret;
ret = nxp_stm_clocksource_init(dev, stm_timer, name, base, clk);
if (ret)