From c165ac0a47f23e87ba1164f5c5df545afc3b43df Mon Sep 17 00:00:00 2001 From: UtsavBalar1231 Date: Fri, 17 Jun 2022 12:04:00 +0000 Subject: [PATCH] Revert "FROMLIST: PM / devfreq: Restart previous governor if new governor fails to start" This reverts commit a2038b4794fe99dd786877b89c98b84d78650f69. Signed-off-by: UtsavBalar1231 --- drivers/devfreq/devfreq.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index d96a2013deac..f0359d05c561 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1054,7 +1054,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, struct devfreq *df = to_devfreq(dev); int ret; char str_governor[DEVFREQ_NAME_LEN + 1]; - const struct devfreq_governor *governor, *prev_gov; + struct devfreq_governor *governor; ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor); if (ret != 1) @@ -1088,21 +1088,12 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, goto gov_stop_out; } } - prev_gov = df->governor; df->governor = governor; strlcpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN); ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL); - if (ret) { + if (ret) dev_warn(dev, "%s: Governor %s not started(%d)\n", __func__, df->governor->name, ret); - if (prev_gov) { - df->governor = prev_gov; - strlcpy(df->governor_name, prev_gov->name, - DEVFREQ_NAME_LEN); - df->governor->event_handler(df, DEVFREQ_GOV_START, - NULL); - } - } gov_stop_out: mutex_unlock(&df->event_lock);