aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c7
-rw-r--r--drivers/regulator/devres.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3cdbabb..ba28d29b66d2 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1597,9 +1597,10 @@ EXPORT_SYMBOL_GPL(regulator_unregister_supply_alias);
1597 * registered any aliases that were registered will be removed 1597 * registered any aliases that were registered will be removed
1598 * before returning to the caller. 1598 * before returning to the caller.
1599 */ 1599 */
1600int regulator_bulk_register_supply_alias(struct device *dev, const char **id, 1600int regulator_bulk_register_supply_alias(struct device *dev,
1601 const char *const *id,
1601 struct device *alias_dev, 1602 struct device *alias_dev,
1602 const char **alias_id, 1603 const char *const *alias_id,
1603 int num_id) 1604 int num_id)
1604{ 1605{
1605 int i; 1606 int i;
@@ -1637,7 +1638,7 @@ EXPORT_SYMBOL_GPL(regulator_bulk_register_supply_alias);
1637 * aliases in one operation. 1638 * aliases in one operation.
1638 */ 1639 */
1639void regulator_bulk_unregister_supply_alias(struct device *dev, 1640void regulator_bulk_unregister_supply_alias(struct device *dev,
1640 const char **id, 1641 const char *const *id,
1641 int num_id) 1642 int num_id)
1642{ 1643{
1643 int i; 1644 int i;
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index f44818b838dc..8f785bc9e510 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -360,9 +360,9 @@ EXPORT_SYMBOL_GPL(devm_regulator_unregister_supply_alias);
360 * will be removed before returning to the caller. 360 * will be removed before returning to the caller.
361 */ 361 */
362int devm_regulator_bulk_register_supply_alias(struct device *dev, 362int devm_regulator_bulk_register_supply_alias(struct device *dev,
363 const char **id, 363 const char *const *id,
364 struct device *alias_dev, 364 struct device *alias_dev,
365 const char **alias_id, 365 const char *const *alias_id,
366 int num_id) 366 int num_id)
367{ 367{
368 int i; 368 int i;
@@ -404,7 +404,7 @@ EXPORT_SYMBOL_GPL(devm_regulator_bulk_register_supply_alias);
404 * will ensure that the resource is freed. 404 * will ensure that the resource is freed.
405 */ 405 */
406void devm_regulator_bulk_unregister_supply_alias(struct device *dev, 406void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
407 const char **id, 407 const char *const *id,
408 int num_id) 408 int num_id)
409{ 409{
410 int i; 410 int i;