| Message ID | b3c936d862b8c81ab568f38bd7acc438cb7efac8.1604646059.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | opp: Allow dev_pm_opp_put_*() APIs to accept NULL opp_table | expand |
Hi Viresh, On 11/6/20 4:03 PM, Viresh Kumar wrote: > The dev_pm_opp_put_*() APIs now accepts a NULL opp_table pointer and so > there is no need for us to carry the extra check. Drop them. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > drivers/devfreq/exynos-bus.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c > index 1e684a448c9e..143fd58ec3dc 100644 > --- a/drivers/devfreq/exynos-bus.c > +++ b/drivers/devfreq/exynos-bus.c > @@ -158,10 +158,8 @@ static void exynos_bus_exit(struct device *dev) > > dev_pm_opp_of_remove_table(dev); > clk_disable_unprepare(bus->clk); > - if (bus->opp_table) { > - dev_pm_opp_put_regulators(bus->opp_table); > - bus->opp_table = NULL; > - } > + dev_pm_opp_put_regulators(bus->opp_table); > + bus->opp_table = NULL; > } > > static void exynos_bus_passive_exit(struct device *dev) > @@ -444,10 +442,8 @@ static int exynos_bus_probe(struct platform_device *pdev) > dev_pm_opp_of_remove_table(dev); > clk_disable_unprepare(bus->clk); > err_reg: > - if (!passive) { > - dev_pm_opp_put_regulators(bus->opp_table); > - bus->opp_table = NULL; > - } > + dev_pm_opp_put_regulators(bus->opp_table); > + bus->opp_table = NULL; > > return ret; > } > Applied it. Thanks. -- Best Regards, Chanwoo Choi Samsung Electronics
On 11/6/20 4:42 PM, Chanwoo Choi wrote: > Hi Viresh, > > On 11/6/20 4:03 PM, Viresh Kumar wrote: >> The dev_pm_opp_put_*() APIs now accepts a NULL opp_table pointer and so >> there is no need for us to carry the extra check. Drop them. >> >> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> >> --- >> drivers/devfreq/exynos-bus.c | 12 ++++-------- >> 1 file changed, 4 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c >> index 1e684a448c9e..143fd58ec3dc 100644 >> --- a/drivers/devfreq/exynos-bus.c >> +++ b/drivers/devfreq/exynos-bus.c >> @@ -158,10 +158,8 @@ static void exynos_bus_exit(struct device *dev) >> >> dev_pm_opp_of_remove_table(dev); >> clk_disable_unprepare(bus->clk); >> - if (bus->opp_table) { >> - dev_pm_opp_put_regulators(bus->opp_table); >> - bus->opp_table = NULL; >> - } >> + dev_pm_opp_put_regulators(bus->opp_table); >> + bus->opp_table = NULL; >> } >> >> static void exynos_bus_passive_exit(struct device *dev) >> @@ -444,10 +442,8 @@ static int exynos_bus_probe(struct platform_device *pdev) >> dev_pm_opp_of_remove_table(dev); >> clk_disable_unprepare(bus->clk); >> err_reg: >> - if (!passive) { >> - dev_pm_opp_put_regulators(bus->opp_table); >> - bus->opp_table = NULL; >> - } >> + dev_pm_opp_put_regulators(bus->opp_table); >> + bus->opp_table = NULL; >> >> return ret; >> } >> > > Applied it. Thanks. > It seems that this patch depends on first patch. So, need to be merged to one git repository. Instead of applying it to devfreq.git, Acked-by: Chanwoo Choi <cw00.choi@samsung.com> -- Best Regards, Chanwoo Choi Samsung Electronics
On 11/6/20 4:46 PM, Chanwoo Choi wrote: > On 11/6/20 4:42 PM, Chanwoo Choi wrote: >> Hi Viresh, >> >> On 11/6/20 4:03 PM, Viresh Kumar wrote: >>> The dev_pm_opp_put_*() APIs now accepts a NULL opp_table pointer and so >>> there is no need for us to carry the extra check. Drop them. >>> >>> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> >>> --- >>> drivers/devfreq/exynos-bus.c | 12 ++++-------- >>> 1 file changed, 4 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c >>> index 1e684a448c9e..143fd58ec3dc 100644 >>> --- a/drivers/devfreq/exynos-bus.c >>> +++ b/drivers/devfreq/exynos-bus.c >>> @@ -158,10 +158,8 @@ static void exynos_bus_exit(struct device *dev) >>> >>> dev_pm_opp_of_remove_table(dev); >>> clk_disable_unprepare(bus->clk); >>> - if (bus->opp_table) { >>> - dev_pm_opp_put_regulators(bus->opp_table); >>> - bus->opp_table = NULL; >>> - } >>> + dev_pm_opp_put_regulators(bus->opp_table); >>> + bus->opp_table = NULL; >>> } >>> >>> static void exynos_bus_passive_exit(struct device *dev) >>> @@ -444,10 +442,8 @@ static int exynos_bus_probe(struct platform_device *pdev) >>> dev_pm_opp_of_remove_table(dev); >>> clk_disable_unprepare(bus->clk); >>> err_reg: >>> - if (!passive) { >>> - dev_pm_opp_put_regulators(bus->opp_table); >>> - bus->opp_table = NULL; >>> - } >>> + dev_pm_opp_put_regulators(bus->opp_table); >>> + bus->opp_table = NULL; >>> >>> return ret; >>> } >>> >> >> Applied it. Thanks. >> > > It seems that this patch depends on first patch. > So, need to be merged to one git repository. > > Instead of applying it to devfreq.git, > Acked-by: Chanwoo Choi <cw00.choi@samsung.com> > Also, need to add 'PM /' prefix to patch title in order to keep the same format with already merged devfreq patches. - 'PM / devfreq: exynos: dev_pm_opp_put_*() accepts NULL argument' -- Best Regards, Chanwoo Choi Samsung Electronics
diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c index 1e684a448c9e..143fd58ec3dc 100644 --- a/drivers/devfreq/exynos-bus.c +++ b/drivers/devfreq/exynos-bus.c @@ -158,10 +158,8 @@ static void exynos_bus_exit(struct device *dev) dev_pm_opp_of_remove_table(dev); clk_disable_unprepare(bus->clk); - if (bus->opp_table) { - dev_pm_opp_put_regulators(bus->opp_table); - bus->opp_table = NULL; - } + dev_pm_opp_put_regulators(bus->opp_table); + bus->opp_table = NULL; } static void exynos_bus_passive_exit(struct device *dev) @@ -444,10 +442,8 @@ static int exynos_bus_probe(struct platform_device *pdev) dev_pm_opp_of_remove_table(dev); clk_disable_unprepare(bus->clk); err_reg: - if (!passive) { - dev_pm_opp_put_regulators(bus->opp_table); - bus->opp_table = NULL; - } + dev_pm_opp_put_regulators(bus->opp_table); + bus->opp_table = NULL; return ret; }
The dev_pm_opp_put_*() APIs now accepts a NULL opp_table pointer and so there is no need for us to carry the extra check. Drop them. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/devfreq/exynos-bus.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -- 2.25.0.rc1.19.g042ed3e048af