Commit e69709f6 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Viresh Kumar
Browse files

opp: Add more resource-managed variants of dev_pm_opp_of_add_table() 



Add resource-managed variants of dev_pm_opp_of_add_table_indexed() and
dev_pm_opp_of_add_table_noclk(), allowing drivers to remove boilerplate
code.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
[ Viresh: Added underscore to devm_of_add_table_indexed() ]
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 3734b9f2

drivers/opp/of.c

+39 −7
Original line number Diff line number Diff line
@@ -1081,6 +1081,17 @@ static void devm_pm_opp_of_table_release(void *data) 
	dev_pm_opp_of_remove_table(data);

}



static int _devm_of_add_table_indexed(struct device *dev, int index, bool getclk)

{

	int ret;



	ret = _of_add_table_indexed(dev, index, getclk);

	if (ret)

		return ret;



	return devm_add_action_or_reset(dev, devm_pm_opp_of_table_release, dev);

}



/**

 * devm_pm_opp_of_add_table() - Initialize opp table from device tree

 * @dev:	device pointer used to lookup OPP table.
@@ -1102,13 +1113,7 @@ static void devm_pm_opp_of_table_release(void *data) 
 */

int devm_pm_opp_of_add_table(struct device *dev)

{

	int ret;



	ret = dev_pm_opp_of_add_table(dev);

	if (ret)

		return ret;



	return devm_add_action_or_reset(dev, devm_pm_opp_of_table_release, dev);

	return _devm_of_add_table_indexed(dev, 0, true);

}

EXPORT_SYMBOL_GPL(devm_pm_opp_of_add_table);
@@ -1151,6 +1156,19 @@ int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) 
}

EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_indexed);



/**

 * devm_pm_opp_of_add_table_indexed() - Initialize indexed opp table from device tree

 * @dev:	device pointer used to lookup OPP table.

 * @index:	Index number.

 *

 * This is a resource-managed variant of dev_pm_opp_of_add_table_indexed().

 */

int devm_pm_opp_of_add_table_indexed(struct device *dev, int index)

{

	return _devm_of_add_table_indexed(dev, index, true);

}

EXPORT_SYMBOL_GPL(devm_pm_opp_of_add_table_indexed);



/**

 * dev_pm_opp_of_add_table_noclk() - Initialize indexed opp table from device

 *		tree without getting clk for device.
@@ -1169,6 +1187,20 @@ int dev_pm_opp_of_add_table_noclk(struct device *dev, int index) 
}

EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_noclk);



/**

 * devm_pm_opp_of_add_table_noclk() - Initialize indexed opp table from device

 *		tree without getting clk for device.

 * @dev:	device pointer used to lookup OPP table.

 * @index:	Index number.

 *

 * This is a resource-managed variant of dev_pm_opp_of_add_table_noclk().

 */

int devm_pm_opp_of_add_table_noclk(struct device *dev, int index)

{

	return _devm_of_add_table_indexed(dev, index, false);

}

EXPORT_SYMBOL_GPL(devm_pm_opp_of_add_table_noclk);



/* CPU device specific helpers */



/**

include/linux/pm_opp.h

+12 −0
Original line number Diff line number Diff line
@@ -439,7 +439,9 @@ static inline int dev_pm_opp_sync_regulators(struct device *dev) 
#if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)

int dev_pm_opp_of_add_table(struct device *dev);

int dev_pm_opp_of_add_table_indexed(struct device *dev, int index);

int devm_pm_opp_of_add_table_indexed(struct device *dev, int index);

int dev_pm_opp_of_add_table_noclk(struct device *dev, int index);

int devm_pm_opp_of_add_table_noclk(struct device *dev, int index);

void dev_pm_opp_of_remove_table(struct device *dev);

int devm_pm_opp_of_add_table(struct device *dev);

int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask);
@@ -465,11 +467,21 @@ static inline int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) 
	return -EOPNOTSUPP;

}



static inline int devm_pm_opp_of_add_table_indexed(struct device *dev, int index)

{

	return -EOPNOTSUPP;

}



static inline int dev_pm_opp_of_add_table_noclk(struct device *dev, int index)

{

	return -EOPNOTSUPP;

}



static inline int devm_pm_opp_of_add_table_noclk(struct device *dev, int index)

{

	return -EOPNOTSUPP;

}



static inline void dev_pm_opp_of_remove_table(struct device *dev)

{

}