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

Commit 4ce568e2 authored by Viresh Kumar's avatar Viresh Kumar Committed by Alex Shi
Browse files

PM / OPP: Rename opp init/free table routines 



free-table routines are opposite of init-table ones, and must be named
to make that clear. Opposite of 'init' is 'exit', but those doesn't suit
really well.

Replace 'init' with 'add' and 'free' with 'remove'.

Reported-by: default avatarPavel Machek <pavel@ucw.cz>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit f0489a5ef4d011e29f78021ad13a543e8769d619)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>

Conflicts:
	rm drivers/cpufreq/mt8173-cpufreq.c
parent 030e3250

arch/arm/mach-imx/mach-imx6q.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void __init imx6q_opp_init(void) 
		return;

	}



	if (of_init_opp_table(cpu_dev)) {

	if (of_add_opp_table(cpu_dev)) {

		pr_warn("failed to init OPP table\n");

		goto put_node;

	}

drivers/base/power/opp.c

+20 −21
Original line number Diff line number Diff line
@@ -828,8 +828,8 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, 
 * The opp is made available by default and it can be controlled using

 * dev_pm_opp_enable/disable functions and may be removed by dev_pm_opp_remove.

 *

 * NOTE: "dynamic" parameter impacts OPPs added by the of_init_opp_table and

 * freed by of_free_opp_table.

 * NOTE: "dynamic" parameter impacts OPPs added by the of_add_opp_table and

 * freed by of_remove_opp_table.

 *

 * Locking: The internal device_opp and opp structures are RCU protected.

 * Hence this function internally uses RCU updater strategy with mutex locks
@@ -1220,7 +1220,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_notifier); 


#ifdef CONFIG_OF

/**

 * of_free_opp_table() - Free OPP table entries created from static DT entries

 * of_remove_opp_table() - Free OPP table entries created from static DT entries

 * @dev:	device pointer used to lookup device OPPs.

 *

 * Free OPPs created using static entries present in DT.
@@ -1231,7 +1231,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_notifier); 
 * that this function is *NOT* called under RCU protection or in contexts where

 * mutex cannot be locked.

 */

void of_free_opp_table(struct device *dev)

void of_remove_opp_table(struct device *dev)

{

	struct device_opp *dev_opp;

	struct dev_pm_opp *opp, *tmp;
@@ -1266,9 +1266,9 @@ void of_free_opp_table(struct device *dev) 
unlock:

	mutex_unlock(&dev_opp_list_lock);

}

EXPORT_SYMBOL_GPL(of_free_opp_table);

EXPORT_SYMBOL_GPL(of_remove_opp_table);



void of_cpumask_free_opp_table(cpumask_var_t cpumask)

void of_cpumask_remove_opp_table(cpumask_var_t cpumask)

{

	struct device *cpu_dev;

	int cpu;
@@ -1283,10 +1283,10 @@ void of_cpumask_free_opp_table(cpumask_var_t cpumask) 
			continue;

		}



		of_free_opp_table(cpu_dev);

		of_remove_opp_table(cpu_dev);

	}

}

EXPORT_SYMBOL_GPL(of_cpumask_free_opp_table);

EXPORT_SYMBOL_GPL(of_cpumask_remove_opp_table);



/* Returns opp descriptor node for a device, caller must do of_node_put() */

static struct device_node *_of_get_opp_desc_node(struct device *dev)
@@ -1302,8 +1302,7 @@ static struct device_node *_of_get_opp_desc_node(struct device *dev) 
}



/* Initializes OPP tables based on new bindings */

static int _of_init_opp_table_v2(struct device *dev,

				 struct device_node *opp_np)

static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np)

{

	struct device_node *np;

	struct device_opp *dev_opp;
@@ -1345,13 +1344,13 @@ static int _of_init_opp_table_v2(struct device *dev, 
	return 0;



free_table:

	of_free_opp_table(dev);

	of_remove_opp_table(dev);



	return ret;

}



/* Initializes OPP tables based on old-deprecated bindings */

static int _of_init_opp_table_v1(struct device *dev)

static int _of_add_opp_table_v1(struct device *dev)

{

	const struct property *prop;

	const __be32 *val;
@@ -1388,7 +1387,7 @@ static int _of_init_opp_table_v1(struct device *dev) 
}



/**

 * of_init_opp_table() - Initialize opp table from device tree

 * of_add_opp_table() - Initialize opp table from device tree

 * @dev:	device pointer used to lookup device OPPs.

 *

 * Register the initial OPP table with the OPP library for given device.
@@ -1410,7 +1409,7 @@ static int _of_init_opp_table_v1(struct device *dev) 
 * -ENODATA	when empty 'operating-points' property is found

 * -EINVAL	when invalid entries are found in opp-v2 table

 */

int of_init_opp_table(struct device *dev)

int of_add_opp_table(struct device *dev)

{

	struct device_node *opp_np;

	int ret;
@@ -1425,17 +1424,17 @@ int of_init_opp_table(struct device *dev) 
		 * Try old-deprecated bindings for backward compatibility with

		 * older dtbs.

		 */

		return _of_init_opp_table_v1(dev);

		return _of_add_opp_table_v1(dev);

	}



	ret = _of_init_opp_table_v2(dev, opp_np);

	ret = _of_add_opp_table_v2(dev, opp_np);

	of_node_put(opp_np);



	return ret;

}

EXPORT_SYMBOL_GPL(of_init_opp_table);

EXPORT_SYMBOL_GPL(of_add_opp_table);



int of_cpumask_init_opp_table(cpumask_var_t cpumask)

int of_cpumask_add_opp_table(cpumask_var_t cpumask)

{

	struct device *cpu_dev;

	int cpu, ret = 0;
@@ -1450,20 +1449,20 @@ int of_cpumask_init_opp_table(cpumask_var_t cpumask) 
			continue;

		}



		ret = of_init_opp_table(cpu_dev);

		ret = of_add_opp_table(cpu_dev);

		if (ret) {

			pr_err("%s: couldn't find opp table for cpu:%d, %d\n",

			       __func__, cpu, ret);



			/* Free all other OPPs */

			of_cpumask_free_opp_table(cpumask);

			of_cpumask_remove_opp_table(cpumask);

			break;

		}

	}



	return ret;

}

EXPORT_SYMBOL_GPL(of_cpumask_init_opp_table);

EXPORT_SYMBOL_GPL(of_cpumask_add_opp_table);



/* Required only for V1 bindings, as v2 can manage it from DT itself */

int set_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask)

drivers/cpufreq/arm_big_little.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct cpufreq_arm_bL_ops { 


	/*

	 * This must set opp table for cpu_dev in a similar way as done by

	 * of_init_opp_table().

	 * of_add_opp_table().

	 */

	int (*init_opp_table)(struct device *cpu_dev);

drivers/cpufreq/arm_big_little_dt.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int dt_init_opp_table(struct device *cpu_dev) 
		return -ENOENT;

	}



	ret = of_init_opp_table(cpu_dev);

	ret = of_add_opp_table(cpu_dev);

	of_node_put(np);



	return ret;
@@ -82,7 +82,7 @@ static struct cpufreq_arm_bL_ops dt_bL_ops = { 
	.name	= "dt-bl",

	.get_transition_latency = dt_get_transition_latency,

	.init_opp_table = dt_init_opp_table,

	.free_opp_table = of_free_opp_table,

	.free_opp_table = of_remove_opp_table,

};



static int generic_bL_probe(struct platform_device *pdev)

drivers/cpufreq/cpufreq-dt.c

+3 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	 *

	 * OPPs might be populated at runtime, don't check for error here

	 */

	of_cpumask_init_opp_table(policy->cpus);

	of_cpumask_add_opp_table(policy->cpus);



	/*

	 * But we need OPP table to function so if it is not there let's
@@ -368,7 +368,7 @@ out_free_cpufreq_table: 
out_free_priv:

	kfree(priv);

out_free_opp:

	of_cpumask_free_opp_table(policy->cpus);

	of_cpumask_remove_opp_table(policy->cpus);

out_node_put:

	of_node_put(np);

out_put_reg_clk:
@@ -385,7 +385,7 @@ static int cpufreq_exit(struct cpufreq_policy *policy) 


	cpufreq_cooling_unregister(priv->cdev);

	dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);

	of_cpumask_free_opp_table(policy->related_cpus);

	of_cpumask_remove_opp_table(policy->related_cpus);

	clk_put(policy->clk);

	if (!IS_ERR(priv->cpu_reg))

		regulator_put(priv->cpu_reg);