Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

+10 -16
+8 -13
drivers/opp/core.c
··· 2395 2395 } 2396 2396 EXPORT_SYMBOL(dev_pm_opp_unregister_notifier); 2397 2397 2398 - void _dev_pm_opp_find_and_remove_table(struct device *dev) 2398 + /** 2399 + * dev_pm_opp_remove_table() - Free all OPPs associated with the device 2400 + * @dev: device pointer used to lookup OPP table. 2401 + * 2402 + * Free both OPPs created using static entries present in DT and the 2403 + * dynamically added entries. 2404 + */ 2405 + void dev_pm_opp_remove_table(struct device *dev) 2399 2406 { 2400 2407 struct opp_table *opp_table; 2401 2408 ··· 2426 2419 2427 2420 /* Drop reference taken while the OPP table was added */ 2428 2421 dev_pm_opp_put_opp_table(opp_table); 2429 - } 2430 - 2431 - /** 2432 - * dev_pm_opp_remove_table() - Free all OPPs associated with the device 2433 - * @dev: device pointer used to lookup OPP table. 2434 - * 2435 - * Free both OPPs created using static entries present in DT and the 2436 - * dynamically added entries. 2437 - */ 2438 - void dev_pm_opp_remove_table(struct device *dev) 2439 - { 2440 - _dev_pm_opp_find_and_remove_table(dev); 2441 2422 } 2442 2423 EXPORT_SYMBOL_GPL(dev_pm_opp_remove_table);
+1 -1
drivers/opp/cpu.c
··· 124 124 continue; 125 125 } 126 126 127 - _dev_pm_opp_find_and_remove_table(cpu_dev); 127 + dev_pm_opp_remove_table(cpu_dev); 128 128 } 129 129 } 130 130
+1 -1
drivers/opp/of.c
··· 616 616 */ 617 617 void dev_pm_opp_of_remove_table(struct device *dev) 618 618 { 619 - _dev_pm_opp_find_and_remove_table(dev); 619 + dev_pm_opp_remove_table(dev); 620 620 } 621 621 EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table); 622 622
-1
drivers/opp/opp.h
··· 217 217 int _get_opp_count(struct opp_table *opp_table); 218 218 struct opp_table *_find_opp_table(struct device *dev); 219 219 struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table); 220 - void _dev_pm_opp_find_and_remove_table(struct device *dev); 221 220 struct dev_pm_opp *_opp_allocate(struct opp_table *opp_table); 222 221 void _opp_free(struct dev_pm_opp *opp); 223 222 int _opp_compare_key(struct dev_pm_opp *opp1, struct dev_pm_opp *opp2);