| Message ID | 20230309095819.2569646-1-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | i2c: sprd: Delete i2c adapter in .remove's error path | expand |
Hello Andy, hello Wolfram, On Thu, Mar 09, 2023 at 01:04:18PM +0100, Uwe Kleine-König wrote: > On Thu, Mar 09, 2023 at 01:17:22PM +0200, Andy Shevchenko wrote: > > On Thu, Mar 9, 2023 at 11:58 AM Uwe Kleine-König > > <u.kleine-koenig@pengutronix.de> wrote: > > > > > > If pm runtime resume fails the .remove callback used to exit early. This > > > resulted in an error message by the driver core but the device gets > > > removed anyhow. This lets the registered i2c adapter stay around with an > > > unbound parent device. > > > > > > So only skip clk disabling if resume failed, but do delete the adapter. > > > > Still worrisome. I would disable clock independently, but the questions are: > > Note that pm-runtime stuff disables the clk, so if resume failed, you > have to assume the clk already being off. > > > 1) why the heck we need this dance with PM runtime for disabling clocks; > > 2) why can't we use devm_clk_get_enabled() or so in the probe; > > These questions are orthogonal to my patch, right? > > Runtime PM might delay suspend, so if you submit two transfers shortly > after another, this might be more effective as the device isn't > suspended in between. (Attention: half-baked knowledge) I wonder if my reply was enough to sort out Andy's concerns?! If so, would be great to get this patch applied. Best regards Uwe
On Thu, Mar 09, 2023 at 10:58:19AM +0100, Uwe Kleine-König wrote: > If pm runtime resume fails the .remove callback used to exit early. This > resulted in an error message by the driver core but the device gets > removed anyhow. This lets the registered i2c adapter stay around with an > unbound parent device. > > So only skip clk disabling if resume failed, but do delete the adapter. > > Fixes: 8b9ec0719834 ("i2c: Add Spreadtrum I2C controller driver") > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Applied to for-current, thanks!
diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c index 4fe15cd78907..ffc54fbf814d 100644 --- a/drivers/i2c/busses/i2c-sprd.c +++ b/drivers/i2c/busses/i2c-sprd.c @@ -576,12 +576,14 @@ static int sprd_i2c_remove(struct platform_device *pdev) struct sprd_i2c *i2c_dev = platform_get_drvdata(pdev); int ret; - ret = pm_runtime_resume_and_get(i2c_dev->dev); + ret = pm_runtime_get_sync(i2c_dev->dev); if (ret < 0) - return ret; + dev_err(&pdev->dev, "Failed to resume device (%pe)\n", ERR_PTR(ret)); i2c_del_adapter(&i2c_dev->adap); - clk_disable_unprepare(i2c_dev->clk); + + if (ret >= 0) + clk_disable_unprepare(i2c_dev->clk); pm_runtime_put_noidle(i2c_dev->dev); pm_runtime_disable(i2c_dev->dev);
If pm runtime resume fails the .remove callback used to exit early. This resulted in an error message by the driver core but the device gets removed anyhow. This lets the registered i2c adapter stay around with an unbound parent device. So only skip clk disabling if resume failed, but do delete the adapter. Fixes: 8b9ec0719834 ("i2c: Add Spreadtrum I2C controller driver") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/i2c/busses/i2c-sprd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)