From 346cde4e35e26dd0f6f247b7910ae2cefdd29da3 Mon Sep 17 00:00:00 2001 From: Finley Xiao Date: Wed, 12 Apr 2017 16:34:23 +0800 Subject: [PATCH] PM / OPP: remove check of supported_hw and prop_name when remove opp table It's also removed in commit fa30184d192e ("PM / OPP: Return opp_table from dev_pm_opp_set_*() routines"). This path fixes the below errors: rk3368:/ # echo 0 > /sys/devices/system/cpu/cpu7/online [ 39.475170] CPU7: shutdown [ 39.478565] psci: CPU7 killed. rk3368:/ # echo 0 > /sys/devices/system/cpu/cpu6/online [ 39.541350] CPU6: shutdown [ 39.544308] psci: CPU6 killed. rk3368:/ # echo 0 > /sys/devices/system/cpu/cpu5/online [ 39.601355] CPU5: shutdown [ 39.604446] psci: CPU5 killed. rk3368:/ # echo 0 > /sys/devices/system/cpu/cpu4/online [ 40.148213] CPU4: shutdown [ 40.151526] psci: CPU4 killed. rk3368:/ # echo 1 > /sys/devices/system/cpu/cpu4/online [ 44.915743] Detected VIPT I-cache on CPU4 [ 44.915997] CPU4: update cpu_capacity 1024 [ 44.916031] CPU4: Booted secondary processor [410fd033] [ 44.921409] cpu cpu4: dev_pm_opp_set_prop_name: Already have prop-name L1 [ 44.921554] cpu cpu4: Failed to set prop name [ 44.921597] cpu cpu4: Failed to set_opp_info [ 44.923002] cpu cpu4: opp_list_debug_create_link: Failed to create link [ 44.923061] cpu cpu4: _add_opp_dev: Failed to register opp debugfs (-12) Change-Id: I4143a8f0327964244dc63864ba159f306890fb16 Signed-off-by: Finley Xiao --- drivers/base/power/opp/core.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index eb42b8a297eb..2050ded41ef7 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -958,12 +958,6 @@ static void _remove_opp_table(struct opp_table *opp_table) if (!list_empty(&opp_table->opp_list)) return; - if (opp_table->supported_hw) - return; - - if (opp_table->prop_name) - return; - if (!IS_ERR(opp_table->regulator)) return; -- 2.34.1