Revert "FROMLIST: PM / devfreq: Restart previous governor if new governor fails to start"
This reverts commit a2038b4794
.
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
parent
de090849fd
commit
c165ac0a47
@ -1054,7 +1054,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,
|
|||||||
struct devfreq *df = to_devfreq(dev);
|
struct devfreq *df = to_devfreq(dev);
|
||||||
int ret;
|
int ret;
|
||||||
char str_governor[DEVFREQ_NAME_LEN + 1];
|
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);
|
ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor);
|
||||||
if (ret != 1)
|
if (ret != 1)
|
||||||
@ -1088,21 +1088,12 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,
|
|||||||
goto gov_stop_out;
|
goto gov_stop_out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
prev_gov = df->governor;
|
|
||||||
df->governor = governor;
|
df->governor = governor;
|
||||||
strlcpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN);
|
strlcpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN);
|
||||||
ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);
|
ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);
|
||||||
if (ret) {
|
if (ret)
|
||||||
dev_warn(dev, "%s: Governor %s not started(%d)\n",
|
dev_warn(dev, "%s: Governor %s not started(%d)\n",
|
||||||
__func__, df->governor->name, ret);
|
__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:
|
gov_stop_out:
|
||||||
mutex_unlock(&df->event_lock);
|
mutex_unlock(&df->event_lock);
|
||||||
|
Loading…
Reference in New Issue
Block a user