1 files changed, 12 insertions, 25 deletions

diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 92f19a005dc3..c79af943a5c0 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -28,7 +28,6 @@ struct s5m8767_info {
         struct device *dev;
         struct sec_pmic_dev *iodev;
         int num_regulators;
-        struct regulator_dev **rdev;
         struct sec_opmode_data *opmode;
 
         int ramp_delay;
@@ -529,16 +528,6 @@ static int s5m8767_pmic_dt_parse_ds_gpio(struct sec_pmic_dev *iodev,
         return 0;
 }
 
-static void s5m8767_pmic_dt_parse_ext_control_gpio(struct sec_pmic_dev *iodev,
-                struct sec_regulator_data *rdata,
-                struct device_node *reg_np)
-{
-        rdata->ext_control_gpio = of_get_named_gpio(reg_np,
-                        "s5m8767,pmic-ext-control-gpios", 0);
-        if (!gpio_is_valid(rdata->ext_control_gpio))
-                rdata->ext_control_gpio = 0;
-}
-
 static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
                                         struct sec_platform_data *pdata)
 {
@@ -587,7 +576,8 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
                         continue;
                 }
 
-                s5m8767_pmic_dt_parse_ext_control_gpio(iodev, rdata, reg_np);
+                rdata->ext_control_gpio = of_get_named_gpio(reg_np,
+                        "s5m8767,pmic-ext-control-gpios", 0);
 
                 rdata->id = i;
                 rdata->initdata = of_get_regulator_init_data(
@@ -695,7 +685,6 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
         struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         struct sec_platform_data *pdata = iodev->pdata;
         struct regulator_config config = { };
-        struct regulator_dev **rdev;
         struct s5m8767_info *s5m8767;
         int i, ret, size, buck_init;
 
@@ -737,11 +726,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         size = sizeof(struct regulator_dev *) * (S5M8767_REG_MAX - 2);
-        s5m8767->rdev = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
-        if (!s5m8767->rdev)
-                return -ENOMEM;
 
-        rdev = s5m8767->rdev;
         s5m8767->dev = &pdev->dev;
         s5m8767->iodev = iodev;
         s5m8767->num_regulators = pdata->num_regulators;
@@ -938,6 +923,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                 const struct sec_voltage_desc *desc;
                 int id = pdata->regulators[i].id;
                 int enable_reg, enable_val;
+                struct regulator_dev *rdev;
 
                 desc = reg_voltage_map[id];
                 if (desc) {
@@ -964,26 +950,27 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                 config.driver_data = s5m8767;
                 config.regmap = iodev->regmap_pmic;
                 config.of_node = pdata->regulators[i].reg_node;
-                config.ena_gpio = config.ena_gpio_flags = 0;
-                if (pdata->regulators[i].ext_control_gpio)
+                config.ena_gpio = -EINVAL;
+                config.ena_gpio_flags = 0;
+                if (gpio_is_valid(pdata->regulators[i].ext_control_gpio))
                         s5m8767_regulator_config_ext_control(s5m8767,
                                         &pdata->regulators[i], &config);
 
-                rdev[i] = devm_regulator_register(&pdev->dev, &regulators[id],
+                rdev = devm_regulator_register(&pdev->dev, &regulators[id],
                                                   &config);
-                if (IS_ERR(rdev[i])) {
-                        ret = PTR_ERR(rdev[i]);
+                if (IS_ERR(rdev)) {
+                        ret = PTR_ERR(rdev);
                         dev_err(s5m8767->dev, "regulator init failed for %d\n",
                                         id);
                         return ret;
                 }
 
-                if (pdata->regulators[i].ext_control_gpio) {
-                        ret = s5m8767_enable_ext_control(s5m8767, rdev[i]);
+                if (gpio_is_valid(pdata->regulators[i].ext_control_gpio)) {
+                        ret = s5m8767_enable_ext_control(s5m8767, rdev);
                         if (ret < 0) {
                                 dev_err(s5m8767->dev,
                                                 "failed to enable gpio control over %s: %d\n",
-                                                rdev[i]->desc->name, ret);
+                                                rdev->desc->name, ret);
                                 return ret;
                         }
                 }