diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-08 17:30:18 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-05-27 05:34:37 -0400 |
commit | 492c826b9facefa84995f4dea917e301b5ee0884 (patch) | |
tree | f0ac1382e4b9047d43d522ce1cb111e74f84d61b /drivers/regulator | |
parent | ba413c5972676295862797a46f9070f81691d80e (diff) |
regulator: Remove supply_regulator_dev from machine configuration
supply_regulator_dev (using a struct pointer) has been deprecated in favour
of supply_regulator (using a regulator name) for quite a few releases
now with a warning generated if it is used and there are no current in tree
users so just remove the code.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/core.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 98d25fcb3930..432faa5cb8af 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -2596,14 +2596,6 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, | |||
2596 | if (ret < 0) | 2596 | if (ret < 0) |
2597 | goto scrub; | 2597 | goto scrub; |
2598 | 2598 | ||
2599 | /* set supply regulator if it exists */ | ||
2600 | if (init_data->supply_regulator && init_data->supply_regulator_dev) { | ||
2601 | dev_err(dev, | ||
2602 | "Supply regulator specified by both name and dev\n"); | ||
2603 | ret = -EINVAL; | ||
2604 | goto scrub; | ||
2605 | } | ||
2606 | |||
2607 | if (init_data->supply_regulator) { | 2599 | if (init_data->supply_regulator) { |
2608 | struct regulator_dev *r; | 2600 | struct regulator_dev *r; |
2609 | int found = 0; | 2601 | int found = 0; |
@@ -2628,14 +2620,6 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, | |||
2628 | goto scrub; | 2620 | goto scrub; |
2629 | } | 2621 | } |
2630 | 2622 | ||
2631 | if (init_data->supply_regulator_dev) { | ||
2632 | dev_warn(dev, "Uses supply_regulator_dev instead of regulator_supply\n"); | ||
2633 | ret = set_supply(rdev, | ||
2634 | dev_get_drvdata(init_data->supply_regulator_dev)); | ||
2635 | if (ret < 0) | ||
2636 | goto scrub; | ||
2637 | } | ||
2638 | |||
2639 | /* add consumers devices */ | 2623 | /* add consumers devices */ |
2640 | for (i = 0; i < init_data->num_consumer_supplies; i++) { | 2624 | for (i = 0; i < init_data->num_consumer_supplies; i++) { |
2641 | ret = set_consumer_device_supply(rdev, | 2625 | ret = set_consumer_device_supply(rdev, |