Commit 8aaf6264 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

opp: Remove _dev_pm_opp_find_and_remove_table() wrapper 



Remove the unnecessary wrapper and merge
_dev_pm_opp_find_and_remove_table() with dev_pm_opp_remove_table().

Tested-by: default avatarRajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent f3364e17

drivers/opp/core.c

+8 −13
Original line number Diff line number Diff line
@@ -2395,7 +2395,14 @@ int dev_pm_opp_unregister_notifier(struct device *dev, 
}

EXPORT_SYMBOL(dev_pm_opp_unregister_notifier);



void _dev_pm_opp_find_and_remove_table(struct device *dev)

/**

 * dev_pm_opp_remove_table() - Free all OPPs associated with the device

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

 *

 * Free both OPPs created using static entries present in DT and the

 * dynamically added entries.

 */

void dev_pm_opp_remove_table(struct device *dev)

{

	struct opp_table *opp_table;
@@ -2420,16 +2427,4 @@ void _dev_pm_opp_find_and_remove_table(struct device *dev) 
	/* Drop reference taken while the OPP table was added */

	dev_pm_opp_put_opp_table(opp_table);

}



/**

 * dev_pm_opp_remove_table() - Free all OPPs associated with the device

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

 *

 * Free both OPPs created using static entries present in DT and the

 * dynamically added entries.

 */

void dev_pm_opp_remove_table(struct device *dev)

{

	_dev_pm_opp_find_and_remove_table(dev);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_remove_table);

drivers/opp/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, 
			continue;

		}



		_dev_pm_opp_find_and_remove_table(cpu_dev);

		dev_pm_opp_remove_table(cpu_dev);

	}

}

drivers/opp/of.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, 
 */

void dev_pm_opp_of_remove_table(struct device *dev)

{

	_dev_pm_opp_find_and_remove_table(dev);

	dev_pm_opp_remove_table(dev);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table);

drivers/opp/opp.h

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ void _get_opp_table_kref(struct opp_table *opp_table); 
int _get_opp_count(struct opp_table *opp_table);

struct opp_table *_find_opp_table(struct device *dev);

struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table);

void _dev_pm_opp_find_and_remove_table(struct device *dev);

struct dev_pm_opp *_opp_allocate(struct opp_table *opp_table);

void _opp_free(struct dev_pm_opp *opp);

int _opp_compare_key(struct dev_pm_opp *opp1, struct dev_pm_opp *opp2);