diff options
author | 2023-04-26 11:03:57 +0200 | |
---|---|---|
committer | 2023-04-26 11:06:00 +0200 | |
commit | 7e0664b660bc8f977d2948d8c8fbfc4809b3e6b4 (patch) | |
tree | e7b9eeb7053a8612699b7a910d61d27446528a7b /drivers/clocksource/timer-stm32-lp.c | |
parent | posix-cpu-timers: Implement the missing timer_wait_running callback (diff) | |
parent | dt-bindings: timer: rockchip: Add rk3588 compatible (diff) | |
download | wireguard-linux-7e0664b660bc8f977d2948d8c8fbfc4809b3e6b4.tar.xz wireguard-linux-7e0664b660bc8f977d2948d8c8fbfc4809b3e6b4.zip |
Merge tag 'timers-v6.4-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource and clockevent updates from Daniel Lezcano:
- Fix error returned for shared timers on Exynos MCT timers (Krzysztof Kozlowski)
- Code reorg by splitting the CPUXGPT timer code (AngeloGioacchino Del Regno)
- Remove the unused mxc_timer_init() function on i.MX (Fabio Estevam)
- Replace of_get_address() and of_translate_address() calls with
single call to of_address_to_resource() on TI timer (Rob Herring)
- Mark driver as non-removable and remove useless remove() callback on
SH MTU2 and STM32 LP timers. Improve the error message in the remove
callback of the TI DM timer (Uwe Kleine-König)
- Convert to platform remove callback returning void on Tegra186, TI
DM timers (Uwe Kleine-König)
- Drop pointless of_match_ptr for ID table in the STM32 LP timer
(Krzysztof Kozlowski)
- Fix memory leak in davinci_timer_register when init fails on DaVinci
(Qinrun Dai)
- Fix finding alwon timer regression on Timer TI DM (Tony Lindgren)
- Use of_property_read_bool() for boolean properties on TI timer (Rob
Herring)
- Drop superfluous rk3288 compatible and add rk3588 compatible DT
bindings (Cristian Ciocaltea)
Link: htttps://lore.kernel.org/lkml/d30fd923-e6e5-a1a6-ca76-1b39f8fad6c9@linaro.org
Diffstat (limited to 'drivers/clocksource/timer-stm32-lp.c')
-rw-r--r-- | drivers/clocksource/timer-stm32-lp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/clocksource/timer-stm32-lp.c b/drivers/clocksource/timer-stm32-lp.c index db2841d0beb8..d14a17549fe8 100644 --- a/drivers/clocksource/timer-stm32-lp.c +++ b/drivers/clocksource/timer-stm32-lp.c @@ -195,11 +195,6 @@ out_clk_disable: return ret; } -static int stm32_clkevent_lp_remove(struct platform_device *pdev) -{ - return -EBUSY; /* cannot unregister clockevent */ -} - static const struct of_device_id stm32_clkevent_lp_of_match[] = { { .compatible = "st,stm32-lptimer-timer", }, {}, @@ -207,11 +202,11 @@ static const struct of_device_id stm32_clkevent_lp_of_match[] = { MODULE_DEVICE_TABLE(of, stm32_clkevent_lp_of_match); static struct platform_driver stm32_clkevent_lp_driver = { - .probe = stm32_clkevent_lp_probe, - .remove = stm32_clkevent_lp_remove, + .probe = stm32_clkevent_lp_probe, .driver = { .name = "stm32-lptimer-timer", - .of_match_table = of_match_ptr(stm32_clkevent_lp_of_match), + .of_match_table = stm32_clkevent_lp_of_match, + .suppress_bind_attrs = true, }, }; module_platform_driver(stm32_clkevent_lp_driver); |