Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2394392f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "devfreq: bwmon: Serialize update_devfreq with governor start/stop()""

parents 02328de3 323c1d0e
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -590,11 +590,9 @@ static int gov_start(struct devfreq *df)
	struct bw_hwmon *hw;
	struct devfreq_dev_status stat;

	mutex_lock(&df->lock);
	node = find_hwmon_node(df);
	if (!node) {
		dev_err(dev, "Unable to find HW monitor!\n");
		mutex_unlock(&df->lock);
		return -ENODEV;
	}
	hw = node->hw;
@@ -619,7 +617,6 @@ static int gov_start(struct devfreq *df)
	if (ret)
		goto err_sysfs;

	mutex_unlock(&df->lock);
	return 0;

err_sysfs:
@@ -629,7 +626,6 @@ static int gov_start(struct devfreq *df)
	node->orig_data = NULL;
	hw->df = NULL;
	node->dev_ab = NULL;
	mutex_unlock(&df->lock);
	return ret;
}

@@ -638,7 +634,6 @@ static void gov_stop(struct devfreq *df)
	struct hwmon_node *node = df->data;
	struct bw_hwmon *hw = node->hw;

	mutex_lock(&df->lock);
	sysfs_remove_group(&df->dev.kobj, node->attr_grp);
	stop_monitor(df, true);
	df->data = node->orig_data;
@@ -653,7 +648,6 @@ static void gov_stop(struct devfreq *df)
	if (node->dev_ab)
		*node->dev_ab = 0;
	node->dev_ab = NULL;
	mutex_unlock(&df->lock);
}

static int gov_suspend(struct devfreq *df)