On Wed, 5 May 2021 11:41:57 +0200 Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> wrote: > Calling pm_runtime_get_sync() at driver's removal time is not > needed, as this will resume PM runtime. Also, the PM runtime > code at pm_runtime_disable() already calls it, if it detects > the need. > > So, change the logic in order to disable PM runtime earlier. > > Reviewed-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> Seems sensible and a lot more along the lines of what I'd expect to see than was originally here. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > --- > drivers/media/platform/exynos-gsc/gsc-core.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c > index 9f41c2e7097a..f49f3322f835 100644 > --- a/drivers/media/platform/exynos-gsc/gsc-core.c > +++ b/drivers/media/platform/exynos-gsc/gsc-core.c > @@ -1210,18 +1210,19 @@ static int gsc_remove(struct platform_device *pdev) > struct gsc_dev *gsc = platform_get_drvdata(pdev); > int i; > > - pm_runtime_get_sync(&pdev->dev); > - > gsc_unregister_m2m_device(gsc); > v4l2_device_unregister(&gsc->v4l2_dev); > > vb2_dma_contig_clear_max_seg_size(&pdev->dev); > - for (i = 0; i < gsc->num_clocks; i++) > - clk_disable_unprepare(gsc->clock[i]); > > - pm_runtime_put_noidle(&pdev->dev); > pm_runtime_disable(&pdev->dev); > > + if (!pm_runtime_status_suspended(&pdev->dev)) > + for (i = 0; i < gsc->num_clocks; i++) > + clk_disable_unprepare(gsc->clock[i]); > + > + pm_runtime_set_suspended(&pdev->dev); > + > dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name); > return 0; > }
