| Message ID | c995335d16d8b4b4ff47b1273869c33e14782b32.1603867405.git.viresh.kumar@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V2,Resend,1/2] drm/lima: Unconditionally call dev_pm_opp_of_remove_table() | expand |
Applied to drm-misc-next. On Wed, Oct 28, 2020 at 2:44 PM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > dev_pm_opp_of_remove_table() doesn't report any errors when it fails to > find the OPP table with error -ENODEV (i.e. OPP table not present for > the device). And we can call dev_pm_opp_of_remove_table() > unconditionally here. > > Reviewed-by: Qiang Yu <yuq825@gmail.com> > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > --- > V2: Applied Reviewed by tag. > --- > drivers/gpu/drm/lima/lima_devfreq.c | 6 +----- > drivers/gpu/drm/lima/lima_devfreq.h | 1 - > 2 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c > index bbe02817721b..cd290d866a04 100644 > --- a/drivers/gpu/drm/lima/lima_devfreq.c > +++ b/drivers/gpu/drm/lima/lima_devfreq.c > @@ -105,10 +105,7 @@ void lima_devfreq_fini(struct lima_device *ldev) > devfreq->devfreq = NULL; > } > > - if (devfreq->opp_of_table_added) { > - dev_pm_opp_of_remove_table(ldev->dev); > - devfreq->opp_of_table_added = false; > - } > + dev_pm_opp_of_remove_table(ldev->dev); > > if (devfreq->regulators_opp_table) { > dev_pm_opp_put_regulators(devfreq->regulators_opp_table); > @@ -162,7 +159,6 @@ int lima_devfreq_init(struct lima_device *ldev) > ret = dev_pm_opp_of_add_table(dev); > if (ret) > goto err_fini; > - ldevfreq->opp_of_table_added = true; > > lima_devfreq_reset(ldevfreq); > > diff --git a/drivers/gpu/drm/lima/lima_devfreq.h b/drivers/gpu/drm/lima/lima_devfreq.h > index 5eed2975a375..2d9b3008ce77 100644 > --- a/drivers/gpu/drm/lima/lima_devfreq.h > +++ b/drivers/gpu/drm/lima/lima_devfreq.h > @@ -18,7 +18,6 @@ struct lima_devfreq { > struct opp_table *clkname_opp_table; > struct opp_table *regulators_opp_table; > struct thermal_cooling_device *cooling; > - bool opp_of_table_added; > > ktime_t busy_time; > ktime_t idle_time; > -- > 2.25.0.rc1.19.g042ed3e048af >
diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c index bbe02817721b..cd290d866a04 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.c +++ b/drivers/gpu/drm/lima/lima_devfreq.c @@ -105,10 +105,7 @@ void lima_devfreq_fini(struct lima_device *ldev) devfreq->devfreq = NULL; } - if (devfreq->opp_of_table_added) { - dev_pm_opp_of_remove_table(ldev->dev); - devfreq->opp_of_table_added = false; - } + dev_pm_opp_of_remove_table(ldev->dev); if (devfreq->regulators_opp_table) { dev_pm_opp_put_regulators(devfreq->regulators_opp_table); @@ -162,7 +159,6 @@ int lima_devfreq_init(struct lima_device *ldev) ret = dev_pm_opp_of_add_table(dev); if (ret) goto err_fini; - ldevfreq->opp_of_table_added = true; lima_devfreq_reset(ldevfreq); diff --git a/drivers/gpu/drm/lima/lima_devfreq.h b/drivers/gpu/drm/lima/lima_devfreq.h index 5eed2975a375..2d9b3008ce77 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.h +++ b/drivers/gpu/drm/lima/lima_devfreq.h @@ -18,7 +18,6 @@ struct lima_devfreq { struct opp_table *clkname_opp_table; struct opp_table *regulators_opp_table; struct thermal_cooling_device *cooling; - bool opp_of_table_added; ktime_t busy_time; ktime_t idle_time;