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 /include/linux/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 'include/linux/regulator')
-rw-r--r-- | include/linux/regulator/machine.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index c4c4fc45f856..8f1a55d99494 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h | |||
@@ -160,8 +160,6 @@ struct regulator_consumer_supply { | |||
160 | * @supply_regulator: Parent regulator. Specified using the regulator name | 160 | * @supply_regulator: Parent regulator. Specified using the regulator name |
161 | * as it appears in the name field in sysfs, which can | 161 | * as it appears in the name field in sysfs, which can |
162 | * be explicitly set using the constraints field 'name'. | 162 | * be explicitly set using the constraints field 'name'. |
163 | * @supply_regulator_dev: Parent regulator (if any) - DEPRECATED in favour | ||
164 | * of supply_regulator. | ||
165 | * | 163 | * |
166 | * @constraints: Constraints. These must be specified for the regulator to | 164 | * @constraints: Constraints. These must be specified for the regulator to |
167 | * be usable. | 165 | * be usable. |
@@ -173,7 +171,6 @@ struct regulator_consumer_supply { | |||
173 | */ | 171 | */ |
174 | struct regulator_init_data { | 172 | struct regulator_init_data { |
175 | const char *supply_regulator; /* or NULL for system supply */ | 173 | const char *supply_regulator; /* or NULL for system supply */ |
176 | struct device *supply_regulator_dev; /* or NULL for system supply */ | ||
177 | 174 | ||
178 | struct regulation_constraints constraints; | 175 | struct regulation_constraints constraints; |
179 | 176 | ||