3 files changed, 2 insertions, 21 deletions

diff --git a/Documentation/power/regulator/machine.txt b/Documentation/power/regulator/machine.txt
index bdec39b9bd75..b42419b52e44 100644
--- a/Documentation/power/regulator/machine.txt
+++ b/Documentation/power/regulator/machine.txt
@@ -53,11 +53,11 @@ static struct regulator_init_data regulator1_data = {
 
 Regulator-1 supplies power to Regulator-2. This relationship must be registered
 with the core so that Regulator-1 is also enabled when Consumer A enables its
-supply (Regulator-2). The supply regulator is set by the supply_regulator_dev
+supply (Regulator-2). The supply regulator is set by the supply_regulator
 field below:-
 
 static struct regulator_init_data regulator2_data = {
-        .supply_regulator_dev = &platform_regulator1_device.dev,
+        .supply_regulator = "regulator_name",
         .constraints = {
                 .min_uV = 1800000,
                 .max_uV = 2000000,
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,
         if (ret < 0)
                 goto scrub;
 
-        /* set supply regulator if it exists */
-        if (init_data->supply_regulator && init_data->supply_regulator_dev) {
-                dev_err(dev,
-                        "Supply regulator specified by both name and dev\n");
-                ret = -EINVAL;
-                goto scrub;
-        }
-
         if (init_data->supply_regulator) {
                 struct regulator_dev *r;
                 int found = 0;
@@ -2628,14 +2620,6 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
                         goto scrub;
         }
 
-        if (init_data->supply_regulator_dev) {
-                dev_warn(dev, "Uses supply_regulator_dev instead of regulator_supply\n");
-                ret = set_supply(rdev,
-                        dev_get_drvdata(init_data->supply_regulator_dev));
-                if (ret < 0)
-                        goto scrub;
-        }
-
         /* add consumers devices */
         for (i = 0; i < init_data->num_consumer_supplies; i++) {
                 ret = set_consumer_device_supply(rdev,
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 {
  * @supply_regulator: Parent regulator.  Specified using the regulator name
  *                    as it appears in the name field in sysfs, which can
  *                    be explicitly set using the constraints field 'name'.
- * @supply_regulator_dev: Parent regulator (if any) - DEPRECATED in favour
- *                        of supply_regulator.
  *
  * @constraints: Constraints.  These must be specified for the regulator to
  *               be usable.
@@ -173,7 +171,6 @@ struct regulator_consumer_supply {
  */
 struct regulator_init_data {
         const char *supply_regulator;        /* or NULL for system supply */
-        struct device *supply_regulator_dev; /* or NULL for system supply */
 
         struct regulation_constraints constraints;