opp: Drop empty-table checks from _put functions
PATCH 1/1 opp: Drop empty-table checks from _put functions
The current_opp is released only when whole OPP table is released, otherwise it's only marked as removed by dev_pm_opp_remove_table(). Functions like dev_pm_opp_put_clkname() and dev_pm_opp_put_supported_hw() are checking whether OPP table is empty and it's not if current_opp is set since it holds the refcount of OPP, this produces a noisy warning from these functions about busy OPP table. Remove the checks to fix it.
--- drivers/opp/core.c | 15 --------------- 1 file changed, 15 deletions(-)
drivers/opp/core.c +0 -15
@@ -1856,9 +1856,6 @@ void dev_pm_opp_put_supported_hw(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -kfree (opp_table->supported_hw); opp_table->supported_hw =NULL ; opp_table->supported_hw_count =0 ;
@@ -1944,9 +1941,6 @@ void dev_pm_opp_put_prop_name(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -kfree (opp_table->prop_name); opp_table->prop_name =NULL ;
@@ -2056,9 +2050,6 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)if (!opp_table->regulators) goto put_opp_table; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -if (opp_table->enabled) {for (i = opp_table->regulator_count -1 ; i >=0 ; i--)regulator_disable (opp_table->regulators[i]);
@@ -2178,9 +2169,6 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -clk_put (opp_table->clk); opp_table->clk =ERR_PTR (-EINVAL );
@@ -2279,9 +2267,6 @@ void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); - opp_table->set_opp =NULL ;mutex_lock (&opp_table->lock);
Signature · 1 line
2.32.0
Viresh Kumar
AppliedQuoted 59 lines · Dmitry Osipenko
The
current_oppis released only when whole OPP table is released, otherwise it's only marked as removed bydev_pm_opp_remove_table(). Functions likedev_pm_opp_put_clkname()anddev_pm_opp_put_supported_hw()are checking whether OPP table is empty and it's not ifcurrent_oppis set since it holds the refcount of OPP, this produces a noisy warning from these functions about busy OPP table. Remove the checks to fix it.Fixes 81c4d8a3c414 ("opp: Keep track of currently programmed OPP")Signed-off-by Dmitry Osipenko <[email protected]>--- drivers/opp/core.c | 15 --------------- 1 file changed, 15 deletions(-)drivers/opp/core.c +0
-12@@ -1856,9 +1856,6 @@ void dev_pm_opp_put_supported_hw(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -kfree (opp_table->supported_hw); opp_table->supported_hw =NULL ; opp_table->supported_hw_count =0 ;@@ -1944,9 +1941,6 @@ void dev_pm_opp_put_prop_name(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -kfree (opp_table->prop_name); opp_table->prop_name =NULL ;@@ -2056,9 +2050,6 @@ void dev_pm_opp_put_regulators(struct opp_table *opp_table)if (!opp_table->regulators) goto put_opp_table; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -if (opp_table->enabled) {for (i = opp_table->regulator_count -1 ; i >=0 ; i--)regulator_disable (opp_table->regulators[i]);@@ -2178,9 +2169,6 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); -clk_put (opp_table->clk); opp_table->clk =ERR_PTR (-EINVAL );
drivers/opp/core.c void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table) · line 2272
Quoted 9 lines
drivers/opp/core.c +0
-3@@ -2279,9 +2267,6 @@ void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table)if (unlikely (!opp_table))return ; -/* Make sure there are no concurrent readers while updating opp_table */ -WARN_ON (!list_empty (&opp_table->opp_list)); - opp_table->set_opp =NULL ;mutex_lock (&opp_table->lock);
Applied. Thanks.
Signature · 1 line
viresh