Skip to content

Commit 3d67fe9

Browse files
Maciej Purskibroonie
authored andcommitted
regulator: core: Refactor regulator_list_voltage()
Change _regulator_list_voltage() argument from regulator to regulator_dev in order to provide better separation of core layers. Allow calling _regulator_list_voltage() from functions, with regulator_dev argument. This refactoring is needed in order to implement setting voltage of coupled regulators. Signed-off-by: Maciej Purski <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 148096a commit 3d67fe9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/regulator/core.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,10 +2447,9 @@ static int _regulator_is_enabled(struct regulator_dev *rdev)
24472447
return rdev->desc->ops->is_enabled(rdev);
24482448
}
24492449

2450-
static int _regulator_list_voltage(struct regulator *regulator,
2451-
unsigned selector, int lock)
2450+
static int _regulator_list_voltage(struct regulator_dev *rdev,
2451+
unsigned selector, int lock)
24522452
{
2453-
struct regulator_dev *rdev = regulator->rdev;
24542453
const struct regulator_ops *ops = rdev->desc->ops;
24552454
int ret;
24562455

@@ -2466,7 +2465,8 @@ static int _regulator_list_voltage(struct regulator *regulator,
24662465
if (lock)
24672466
mutex_unlock(&rdev->mutex);
24682467
} else if (rdev->is_switch && rdev->supply) {
2469-
ret = _regulator_list_voltage(rdev->supply, selector, lock);
2468+
ret = _regulator_list_voltage(rdev->supply->rdev,
2469+
selector, lock);
24702470
} else {
24712471
return -EINVAL;
24722472
}
@@ -2542,7 +2542,7 @@ EXPORT_SYMBOL_GPL(regulator_count_voltages);
25422542
*/
25432543
int regulator_list_voltage(struct regulator *regulator, unsigned selector)
25442544
{
2545-
return _regulator_list_voltage(regulator, selector, 1);
2545+
return _regulator_list_voltage(regulator->rdev, selector, 1);
25462546
}
25472547
EXPORT_SYMBOL_GPL(regulator_list_voltage);
25482548

0 commit comments

Comments
 (0)