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

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

Merge "clk: provider: cleanup of unused use_max_uV"

parents d984d241 96f0596c

drivers/clk/clk.c

+3 −6
Original line number Diff line number Diff line
@@ -646,8 +646,7 @@ static int clk_update_vdd(struct clk_vdd_class *vdd_class) 
	for (i = 0; i < vdd_class->num_regulators; i++) {

		pr_debug("Set Voltage level Min %d, Max %d\n", uv[new_base + i],

				uv[max_lvl + i]);

		rc = regulator_set_voltage(r[i], uv[new_base + i],

			vdd_class->use_max_uV ? INT_MAX : uv[max_lvl + i]);

		rc = regulator_set_voltage(r[i], uv[new_base + i], INT_MAX);

		if (rc)

			goto set_voltage_fail;
@@ -668,13 +667,11 @@ static int clk_update_vdd(struct clk_vdd_class *vdd_class) 
	return rc;



enable_disable_fail:

	regulator_set_voltage(r[i], uv[cur_base + i],

			vdd_class->use_max_uV ? INT_MAX : uv[max_lvl + i]);

	regulator_set_voltage(r[i], uv[cur_base + i], INT_MAX);



set_voltage_fail:

	for (i--; i >= 0; i--) {

		regulator_set_voltage(r[i], uv[cur_base + i],

		       vdd_class->use_max_uV ? INT_MAX : uv[max_lvl + i]);

		regulator_set_voltage(r[i], uv[cur_base + i], INT_MAX);

		if (cur_lvl == 0 || cur_lvl == vdd_class->num_levels)

			regulator_disable(r[i]);

		else if (level == 0)

drivers/clk/qcom/dispcc-kona.c

+0 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,6 @@ static int disp_cc_kona_probe(struct platform_device *pdev) 
				"Unable to get vdd_mm regulator\n");

		return PTR_ERR(vdd_mm.regulator[0]);

	}

	vdd_mm.use_max_uV = true;



	dispcc_bus_id = msm_bus_scale_register_client(&clk_debugfs_scale_table);

	if (!dispcc_bus_id) {

include/linux/clk-provider.h

+0 −2
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ struct regulator; 
 * @level_votes: array of votes for each level

 * @num_levels: specifies the size of level_votes array

 * @skip_handoff: do not vote for the max possible voltage during init

 * @use_max_uV: use INT_MAX for max_uV when calling regulator_set_voltage

 * @cur_level: the currently set voltage level

 * @lock: lock to protect this struct

 */
@@ -326,7 +325,6 @@ struct clk_vdd_class { 
	int *level_votes;

	int num_levels;

	bool skip_handoff;

	bool use_max_uV;

	unsigned long cur_level;

	struct mutex lock;

};