[PATCH] i2c: xiic: restore runtime PM teardown in remove to fix clk WARN flood

[PATCH] i2c: xiic: restore runtime PM teardown in remove to fix clk WARN flood

[Abdurrahman Hussain]

The devres conversion dropped the remove-time runtime PM trailer
(pm_runtime_disable + pm_runtime_set_suspended +
pm_runtime_dont_use_autosuspend). devm_pm_runtime_enable's release
action then calls pm_runtime_dont_use_autosuspend() while runtime PM
is still enabled, triggering an immediate runtime suspend: the suspend
callback clk_disable()s the clock that the devm_clk_get_enabled()
release is about to clk_disable_unprepare(), and every device teardown
WARNs in clk_core_disable() ("clkN already disabled").

Restore the trailer: with runtime PM disabled and the state forced to
suspended before devres runs, the suspend callback cannot fire and the
clock enable count stays balanced.

Fixes: 50c63491ff26 ("i2c: xiic: switch to devres managed APIs")
---
Signed-off-by: Abdurrahman Hussain <abdurrahman@nexthop.ai>
---
 drivers/i2c/busses/i2c-xiic.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 3e7735e1dae0..89636ca36915 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -1545,6 +1545,9 @@ static void xiic_i2c_remove(struct platform_device *pdev)
 		xiic_deinit(i2c);
 
 	pm_runtime_put_sync(dev);
+	pm_runtime_disable(dev);
+	pm_runtime_set_suspended(dev);
+	pm_runtime_dont_use_autosuspend(dev);
 }
 
 static const struct dev_pm_ops xiic_dev_pm_ops = {

---
base-commit: d58772d8520c7ef247c4b95c9bd76d3a25da9ff5
change-id: 20260813-i2c-xiic-restore-runtime-pm-teardown-dd0ab1db2c02

Best regards,
--  
Abdurrahman Hussain <abdurrahman@nexthop.ai>

Re: [PATCH] i2c: xiic: restore runtime PM teardown in remove to fix clk WARN flood

[Andy Shevchenko]

On Thu, Aug 13, 2026 at 02:06:40PM -0700, Abdurrahman Hussain wrote:
> The devres conversion dropped the remove-time runtime PM trailer
> (pm_runtime_disable + pm_runtime_set_suspended +
> pm_runtime_dont_use_autosuspend). devm_pm_runtime_enable's release
> action then calls pm_runtime_dont_use_autosuspend() while runtime PM
> is still enabled, triggering an immediate runtime suspend: the suspend
> callback clk_disable()s the clock that the devm_clk_get_enabled()
> release is about to clk_disable_unprepare(), and every device teardown
> WARNs in clk_core_disable() ("clkN already disabled").
> 
> Restore the trailer: with runtime PM disabled and the state forced to
> suspended before devres runs, the suspend callback cannot fire and the
> clock enable count stays balanced.
> 
> Fixes: 50c63491ff26 ("i2c: xiic: switch to devres managed APIs")
> ---

^^^ Something went wrong. The SoB must be part of the official commit message.
Putting it under the cutter '---' line makes it disappear.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH] i2c: xiic: restore runtime PM teardown in remove to fix clk WARN flood

[Abdurrahman Hussain]

On Fri Aug 14, 2026 at 2:30 AM PDT, Andy Shevchenko wrote:
> On Thu, Aug 13, 2026 at 02:06:40PM -0700, Abdurrahman Hussain wrote:
>> The devres conversion dropped the remove-time runtime PM trailer
>> (pm_runtime_disable + pm_runtime_set_suspended +
>> pm_runtime_dont_use_autosuspend). devm_pm_runtime_enable's release
>> action then calls pm_runtime_dont_use_autosuspend() while runtime PM
>> is still enabled, triggering an immediate runtime suspend: the suspend
>> callback clk_disable()s the clock that the devm_clk_get_enabled()
>> release is about to clk_disable_unprepare(), and every device teardown
>> WARNs in clk_core_disable() ("clkN already disabled").
>> 
>> Restore the trailer: with runtime PM disabled and the state forced to
>> suspended before devres runs, the suspend callback cannot fire and the
>> clock enable count stays balanced.
>> 
>> Fixes: 50c63491ff26 ("i2c: xiic: switch to devres managed APIs")
>> ---
>
> ^^^ Something went wrong. The SoB must be part of the official commit message.
> Putting it under the cutter '---' line makes it disappear.

My bad,

Let me fix it and send v2

Thanks,
Abdurrahman