diff mbox series

OPP: Put opp table in dev_pm_opp_set_rate() all the time

Message ID 20200811212836.2531613-1-swboyd@chromium.org
State New
Delegated to: viresh kumar
Headers show
Series OPP: Put opp table in dev_pm_opp_set_rate() all the time | expand

Commit Message

Stephen Boyd Aug. 11, 2020, 9:28 p.m. UTC
We get the opp_table pointer at the top of the function and so we should
put the pointer at the end of the function like all other exit paths
from this function do.

Cc: Rajendra Nayak <rnayak@codeaurora.org>
Fixes: aca48b61f963 ("opp: Manage empty OPP tables with clk handle")
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
 drivers/opp/core.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Rajendra Nayak Aug. 12, 2020, 6:10 a.m. UTC | #1
On 8/12/2020 2:58 AM, Stephen Boyd wrote:
> We get the opp_table pointer at the top of the function and so we should
> put the pointer at the end of the function like all other exit paths
> from this function do.
> 
> Cc: Rajendra Nayak <rnayak@codeaurora.org>
> Fixes: aca48b61f963 ("opp: Manage empty OPP tables with clk handle")
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>

Thanks for the fix.
Reviewed-by: Rajendra Nayak <rnayak@codeaurora.org>

> ---
>   drivers/opp/core.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/opp/core.c b/drivers/opp/core.c
> index 9d7fb45b1786..bdb028c7793d 100644
> --- a/drivers/opp/core.c
> +++ b/drivers/opp/core.c
> @@ -893,8 +893,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
>   		 * have OPP table for the device, while others don't and
>   		 * opp_set_rate() just needs to behave like clk_set_rate().
>   		 */
> -		if (!_get_opp_count(opp_table))
> -			return 0;
> +		if (!_get_opp_count(opp_table)) {
> +			ret = 0;
> +			goto put_opp_table;
> +		}
>   
>   		if (!opp_table->required_opp_tables && !opp_table->regulators &&
>   		    !opp_table->paths) {
> @@ -905,7 +907,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
>   
>   		ret = _set_opp_bw(opp_table, NULL, dev, true);
>   		if (ret)
> -			return ret;
> +			goto put_opp_table;
>   
>   		if (opp_table->regulator_enabled) {
>   			regulator_disable(opp_table->regulators[0]);
>
Viresh Kumar Aug. 12, 2020, 8:20 a.m. UTC | #2
On 11-08-20, 14:28, Stephen Boyd wrote:
> @@ -905,7 +907,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
>  
>  		ret = _set_opp_bw(opp_table, NULL, dev, true);
>  		if (ret)
> -			return ret;
> +			goto put_opp_table;

This was broken by a different patch.

Fixes: b00e667a6d8b ("opp: Remove bandwidth votes when target_freq is zero")

I did split the patch into two and applied the correct tags (not yet
pushed though).
Stephen Boyd Aug. 12, 2020, 8:22 a.m. UTC | #3
Quoting Viresh Kumar (2020-08-12 01:20:13)
> On 11-08-20, 14:28, Stephen Boyd wrote:
> > @@ -905,7 +907,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
> >  
> >               ret = _set_opp_bw(opp_table, NULL, dev, true);
> >               if (ret)
> > -                     return ret;
> > +                     goto put_opp_table;
> 
> This was broken by a different patch.
> 
> Fixes: b00e667a6d8b ("opp: Remove bandwidth votes when target_freq is zero")
> 
> I did split the patch into two and applied the correct tags (not yet
> pushed though).

Ok, makes sense. Thanks!
diff mbox series

Patch

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 9d7fb45b1786..bdb028c7793d 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -893,8 +893,10 @@  int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
 		 * have OPP table for the device, while others don't and
 		 * opp_set_rate() just needs to behave like clk_set_rate().
 		 */
-		if (!_get_opp_count(opp_table))
-			return 0;
+		if (!_get_opp_count(opp_table)) {
+			ret = 0;
+			goto put_opp_table;
+		}
 
 		if (!opp_table->required_opp_tables && !opp_table->regulators &&
 		    !opp_table->paths) {
@@ -905,7 +907,7 @@  int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
 
 		ret = _set_opp_bw(opp_table, NULL, dev, true);
 		if (ret)
-			return ret;
+			goto put_opp_table;
 
 		if (opp_table->regulator_enabled) {
 			regulator_disable(opp_table->regulators[0]);