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

OPP: Remove dev{m}_pm_opp_of_add_table_noclk()

Remove the now unused variants and the now unnecessary "getclk"
parameter from few routines.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

+8 -52
+8 -40
drivers/opp/of.c
··· 1120 1120 return ret; 1121 1121 } 1122 1122 1123 - static int _of_add_table_indexed(struct device *dev, int index, bool getclk) 1123 + static int _of_add_table_indexed(struct device *dev, int index) 1124 1124 { 1125 1125 struct opp_table *opp_table; 1126 1126 int ret, count; ··· 1136 1136 index = 0; 1137 1137 } 1138 1138 1139 - opp_table = _add_opp_table_indexed(dev, index, getclk); 1139 + opp_table = _add_opp_table_indexed(dev, index, true); 1140 1140 if (IS_ERR(opp_table)) 1141 1141 return PTR_ERR(opp_table); 1142 1142 ··· 1160 1160 dev_pm_opp_of_remove_table(data); 1161 1161 } 1162 1162 1163 - static int _devm_of_add_table_indexed(struct device *dev, int index, bool getclk) 1163 + static int _devm_of_add_table_indexed(struct device *dev, int index) 1164 1164 { 1165 1165 int ret; 1166 1166 1167 - ret = _of_add_table_indexed(dev, index, getclk); 1167 + ret = _of_add_table_indexed(dev, index); 1168 1168 if (ret) 1169 1169 return ret; 1170 1170 ··· 1192 1192 */ 1193 1193 int devm_pm_opp_of_add_table(struct device *dev) 1194 1194 { 1195 - return _devm_of_add_table_indexed(dev, 0, true); 1195 + return _devm_of_add_table_indexed(dev, 0); 1196 1196 } 1197 1197 EXPORT_SYMBOL_GPL(devm_pm_opp_of_add_table); 1198 1198 ··· 1215 1215 */ 1216 1216 int dev_pm_opp_of_add_table(struct device *dev) 1217 1217 { 1218 - return _of_add_table_indexed(dev, 0, true); 1218 + return _of_add_table_indexed(dev, 0); 1219 1219 } 1220 1220 EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table); 1221 1221 ··· 1231 1231 */ 1232 1232 int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) 1233 1233 { 1234 - return _of_add_table_indexed(dev, index, true); 1234 + return _of_add_table_indexed(dev, index); 1235 1235 } 1236 1236 EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_indexed); 1237 1237 ··· 1244 1244 */ 1245 1245 int devm_pm_opp_of_add_table_indexed(struct device *dev, int index) 1246 1246 { 1247 - return _devm_of_add_table_indexed(dev, index, true); 1247 + return _devm_of_add_table_indexed(dev, index); 1248 1248 } 1249 1249 EXPORT_SYMBOL_GPL(devm_pm_opp_of_add_table_indexed); 1250 - 1251 - /** 1252 - * dev_pm_opp_of_add_table_noclk() - Initialize indexed opp table from device 1253 - * tree without getting clk for device. 1254 - * @dev: device pointer used to lookup OPP table. 1255 - * @index: Index number. 1256 - * 1257 - * Register the initial OPP table with the OPP library for given device only 1258 - * using the "operating-points-v2" property. Do not try to get the clk for the 1259 - * device. 1260 - * 1261 - * Return: Refer to dev_pm_opp_of_add_table() for return values. 1262 - */ 1263 - int dev_pm_opp_of_add_table_noclk(struct device *dev, int index) 1264 - { 1265 - return _of_add_table_indexed(dev, index, false); 1266 - } 1267 - EXPORT_SYMBOL_GPL(dev_pm_opp_of_add_table_noclk); 1268 - 1269 - /** 1270 - * devm_pm_opp_of_add_table_noclk() - Initialize indexed opp table from device 1271 - * tree without getting clk for device. 1272 - * @dev: device pointer used to lookup OPP table. 1273 - * @index: Index number. 1274 - * 1275 - * This is a resource-managed variant of dev_pm_opp_of_add_table_noclk(). 1276 - */ 1277 - int devm_pm_opp_of_add_table_noclk(struct device *dev, int index) 1278 - { 1279 - return _devm_of_add_table_indexed(dev, index, false); 1280 - } 1281 - EXPORT_SYMBOL_GPL(devm_pm_opp_of_add_table_noclk); 1282 1250 1283 1251 /* CPU device specific helpers */ 1284 1252
-12
include/linux/pm_opp.h
··· 402 402 int dev_pm_opp_of_add_table(struct device *dev); 403 403 int dev_pm_opp_of_add_table_indexed(struct device *dev, int index); 404 404 int devm_pm_opp_of_add_table_indexed(struct device *dev, int index); 405 - int dev_pm_opp_of_add_table_noclk(struct device *dev, int index); 406 - int devm_pm_opp_of_add_table_noclk(struct device *dev, int index); 407 405 void dev_pm_opp_of_remove_table(struct device *dev); 408 406 int devm_pm_opp_of_add_table(struct device *dev); 409 407 int dev_pm_opp_of_cpumask_add_table(const struct cpumask *cpumask); ··· 428 430 } 429 431 430 432 static inline int devm_pm_opp_of_add_table_indexed(struct device *dev, int index) 431 - { 432 - return -EOPNOTSUPP; 433 - } 434 - 435 - static inline int dev_pm_opp_of_add_table_noclk(struct device *dev, int index) 436 - { 437 - return -EOPNOTSUPP; 438 - } 439 - 440 - static inline int devm_pm_opp_of_add_table_noclk(struct device *dev, int index) 441 433 { 442 434 return -EOPNOTSUPP; 443 435 }