Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Markus Pargmann]

Hi,

Sorry for the delay, holiday and so on.

On Mon, Oct 13, 2014 at 04:42:35PM +0200, Mark Brown wrote:
> On Wed, Oct 08, 2014 at 03:47:06PM +0200, Markus Pargmann wrote:
> 
> > --- a/drivers/regulator/max8952.c
> > +++ b/drivers/regulator/max8952.c
> > @@ -225,6 +225,8 @@ static int max8952_pmic_probe(struct i2c_client *client,
> > config.of_node = client->dev.of_node;
> >  
> > config.ena_gpio = pdata->gpio_en;
> > +   if (!pdata)
> > +   config.ena_gpio_initialized = true;
> 
> This looks wrong, we're checking for pdata being non-NULL immediately
> after dereferencing pdata.

Yes this is wrong, I changed it to check for client->dev.of_node instead.

Thanks,

Markus

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |


signature.asc
Description: Digital signature

Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Markus Pargmann]

Hi,

Sorry for the delay, holiday and so on.

On Mon, Oct 13, 2014 at 04:42:35PM +0200, Mark Brown wrote:
 On Wed, Oct 08, 2014 at 03:47:06PM +0200, Markus Pargmann wrote:
 
  --- a/drivers/regulator/max8952.c
  +++ b/drivers/regulator/max8952.c
  @@ -225,6 +225,8 @@ static int max8952_pmic_probe(struct i2c_client *client,
  config.of_node = client-dev.of_node;
   
  config.ena_gpio = pdata-gpio_en;
  +   if (!pdata)
  +   config.ena_gpio_initialized = true;
 
 This looks wrong, we're checking for pdata being non-NULL immediately
 after dereferencing pdata.

Yes this is wrong, I changed it to check for client-dev.of_node instead.

Thanks,

Markus

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |


signature.asc
Description: Digital signature

Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Mark Brown]

On Wed, Oct 08, 2014 at 03:47:06PM +0200, Markus Pargmann wrote:

> --- a/drivers/regulator/max8952.c
> +++ b/drivers/regulator/max8952.c
> @@ -225,6 +225,8 @@ static int max8952_pmic_probe(struct i2c_client *client,
>   config.of_node = client->dev.of_node;
>  
>   config.ena_gpio = pdata->gpio_en;
> + if (!pdata)
> + config.ena_gpio_initialized = true;

This looks wrong, we're checking for pdata being non-NULL immediately
after dereferencing pdata.


signature.asc
Description: Digital signature

Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Mark Brown]

On Wed, Oct 08, 2014 at 03:47:06PM +0200, Markus Pargmann wrote:

 --- a/drivers/regulator/max8952.c
 +++ b/drivers/regulator/max8952.c
 @@ -225,6 +225,8 @@ static int max8952_pmic_probe(struct i2c_client *client,
   config.of_node = client-dev.of_node;
  
   config.ena_gpio = pdata-gpio_en;
 + if (!pdata)
 + config.ena_gpio_initialized = true;

This looks wrong, we're checking for pdata being non-NULL immediately
after dereferencing pdata.


signature.asc
Description: Digital signature

Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Markus Pargmann]

On Wed, Oct 08, 2014 at 04:53:33PM +0200, Krzysztof Kozlowski wrote:
> On śro, 2014-10-08 at 15:47 +0200, Markus Pargmann wrote:
> > This patch sets ena_gpio_initialized for all drivers which set a
> > ena_gpio from parsed DT properties. Drivers using pdata may get zero
> > initialized pdata and therefore copy a 0 into the regulator_config
> > ena_gpio field.
> > 
> > Signed-off-by: Markus Pargmann 
> 
> (... rewind to s2m/s5m... I think Mark asked for splitting this per
> driver)

Then I misunderstood Mark, I thought he just meant the fixups at the end
of the last series.

> 
> > diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
> > index adab82d5279f..49b9e1ddc87e 100644
> > --- a/drivers/regulator/s2mps11.c
> > +++ b/drivers/regulator/s2mps11.c
> > @@ -897,6 +897,7 @@ common_reg:
> > config.of_node = rdata[i].of_node;
> > }
> > config.ena_gpio = s2mps11->ext_control_gpio[i];
> > +   config.ena_gpio_initialized = true;
> >  
> > regulator = devm_regulator_register(>dev,
> > [i], );
> 
> Looks good.
> 
> > diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
> > index 0ab5cbeeb797..7f176cdb7e37 100644
> > --- a/drivers/regulator/s5m8767.c
> > +++ b/drivers/regulator/s5m8767.c
> > @@ -466,6 +466,7 @@ static void s5m8767_regulator_config_ext_control(struct 
> > s5m8767_info *s5m8767,
> > }
> >  
> > config->ena_gpio = rdata->ext_control_gpio;
> > +   config->ena_gpio_initialized = true;
> > config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
> >  }
> 
> It will work fine but a little messy. The 'config' is re-used in loop
> for next regulators, so:
> 1. regulator X with GPIO=-ENODEV, ena_gpio_initialized=false
> 2. regulator X+1 with real GPIO, ena_gpio_initialized=true
> 3. regulator X+2 with GPIO=-ENODEV, ena_gpio_initialized=true
> 
> 
> Instead do this in probe around line 950:
>  config.ena_gpio = -EINVAL;
>  config.ena_gpio_flags = 0;
> +config->ena_gpio_initialized = true;
>  if (gpio_is_valid(pdata->regulators[i].ext_control_gpio))
>   s5m8767_regulator_config_ext_control(s5m8767,
>   >regulators[i], );

I will fix that.

Thanks,

Markus

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |


signature.asc
Description: Digital signature

Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Markus Pargmann]

On Wed, Oct 08, 2014 at 04:53:33PM +0200, Krzysztof Kozlowski wrote:
 On śro, 2014-10-08 at 15:47 +0200, Markus Pargmann wrote:
  This patch sets ena_gpio_initialized for all drivers which set a
  ena_gpio from parsed DT properties. Drivers using pdata may get zero
  initialized pdata and therefore copy a 0 into the regulator_config
  ena_gpio field.
  
  Signed-off-by: Markus Pargmann m...@pengutronix.de
 
 (... rewind to s2m/s5m... I think Mark asked for splitting this per
 driver)

Then I misunderstood Mark, I thought he just meant the fixups at the end
of the last series.

 
  diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
  index adab82d5279f..49b9e1ddc87e 100644
  --- a/drivers/regulator/s2mps11.c
  +++ b/drivers/regulator/s2mps11.c
  @@ -897,6 +897,7 @@ common_reg:
  config.of_node = rdata[i].of_node;
  }
  config.ena_gpio = s2mps11-ext_control_gpio[i];
  +   config.ena_gpio_initialized = true;
   
  regulator = devm_regulator_register(pdev-dev,
  regulators[i], config);
 
 Looks good.
 
  diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
  index 0ab5cbeeb797..7f176cdb7e37 100644
  --- a/drivers/regulator/s5m8767.c
  +++ b/drivers/regulator/s5m8767.c
  @@ -466,6 +466,7 @@ static void s5m8767_regulator_config_ext_control(struct 
  s5m8767_info *s5m8767,
  }
   
  config-ena_gpio = rdata-ext_control_gpio;
  +   config-ena_gpio_initialized = true;
  config-ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
   }
 
 It will work fine but a little messy. The 'config' is re-used in loop
 for next regulators, so:
 1. regulator X with GPIO=-ENODEV, ena_gpio_initialized=false
 2. regulator X+1 with real GPIO, ena_gpio_initialized=true
 3. regulator X+2 with GPIO=-ENODEV, ena_gpio_initialized=true
 
 
 Instead do this in probe around line 950:
  config.ena_gpio = -EINVAL;
  config.ena_gpio_flags = 0;
 +config-ena_gpio_initialized = true;
  if (gpio_is_valid(pdata-regulators[i].ext_control_gpio))
   s5m8767_regulator_config_ext_control(s5m8767,
   pdata-regulators[i], config);

I will fix that.

Thanks,

Markus

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |


signature.asc
Description: Digital signature

Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Krzysztof Kozlowski]

On śro, 2014-10-08 at 15:47 +0200, Markus Pargmann wrote:
> This patch sets ena_gpio_initialized for all drivers which set a
> ena_gpio from parsed DT properties. Drivers using pdata may get zero
> initialized pdata and therefore copy a 0 into the regulator_config
> ena_gpio field.
> 
> Signed-off-by: Markus Pargmann 

(... rewind to s2m/s5m... I think Mark asked for splitting this per
driver)

> diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
> index adab82d5279f..49b9e1ddc87e 100644
> --- a/drivers/regulator/s2mps11.c
> +++ b/drivers/regulator/s2mps11.c
> @@ -897,6 +897,7 @@ common_reg:
>   config.of_node = rdata[i].of_node;
>   }
>   config.ena_gpio = s2mps11->ext_control_gpio[i];
> + config.ena_gpio_initialized = true;
>  
>   regulator = devm_regulator_register(>dev,
>   [i], );

Looks good.

> diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
> index 0ab5cbeeb797..7f176cdb7e37 100644
> --- a/drivers/regulator/s5m8767.c
> +++ b/drivers/regulator/s5m8767.c
> @@ -466,6 +466,7 @@ static void s5m8767_regulator_config_ext_control(struct 
> s5m8767_info *s5m8767,
>   }
>  
>   config->ena_gpio = rdata->ext_control_gpio;
> + config->ena_gpio_initialized = true;
>   config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
>  }

It will work fine but a little messy. The 'config' is re-used in loop
for next regulators, so:
1. regulator X with GPIO=-ENODEV, ena_gpio_initialized=false
2. regulator X+1 with real GPIO, ena_gpio_initialized=true
3. regulator X+2 with GPIO=-ENODEV, ena_gpio_initialized=true


Instead do this in probe around line 950:
 config.ena_gpio = -EINVAL;
 config.ena_gpio_flags = 0;
+config->ena_gpio_initialized = true;
 if (gpio_is_valid(pdata->regulators[i].ext_control_gpio))
s5m8767_regulator_config_ext_control(s5m8767,
>regulators[i], );


Best regards,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Markus Pargmann]

This patch sets ena_gpio_initialized for all drivers which set a
ena_gpio from parsed DT properties. Drivers using pdata may get zero
initialized pdata and therefore copy a 0 into the regulator_config
ena_gpio field.

Signed-off-by: Markus Pargmann 
---
 drivers/regulator/arizona-ldo1.c   | 1 +
 drivers/regulator/fixed.c  | 4 +++-
 drivers/regulator/gpio-regulator.c | 4 +++-
 drivers/regulator/max8952.c| 2 ++
 drivers/regulator/s2mps11.c| 1 +
 drivers/regulator/s5m8767.c| 1 +
 drivers/regulator/tps65090-regulator.c | 1 +
 drivers/regulator/wm8994-regulator.c   | 6 --
 8 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 4c9db589f6c1..f4ecf18222d3 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -260,6 +260,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
ret = arizona_ldo1_of_get_pdata(arizona, );
if (ret < 0)
return ret;
+   config.ena_gpio_initialized = true;
}
}
 
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 354105eff1f8..441a3e90e266 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -157,8 +157,10 @@ static int reg_fixed_voltage_probe(struct platform_device 
*pdev)
 
drvdata->desc.fixed_uV = config->microvolts;
 
-   if (config->gpio >= 0)
+   if (config->gpio >= 0) {
cfg.ena_gpio = config->gpio;
+   cfg.ena_gpio_initialized = true;
+   }
cfg.ena_gpio_invert = !config->enable_high;
if (config->enabled_at_boot) {
if (config->enable_high)
diff --git a/drivers/regulator/gpio-regulator.c 
b/drivers/regulator/gpio-regulator.c
index 989b23b377c0..5da0125fac6a 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -322,8 +322,10 @@ static int gpio_regulator_probe(struct platform_device 
*pdev)
cfg.driver_data = drvdata;
cfg.of_node = np;
 
-   if (config->enable_gpio >= 0)
+   if (config->enable_gpio >= 0) {
cfg.ena_gpio = config->enable_gpio;
+   cfg.ena_gpio_initialized = true;
+   }
cfg.ena_gpio_invert = !config->enable_high;
if (config->enabled_at_boot) {
if (config->enable_high)
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index f7f9efcfedb7..6d1802b596ec 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -225,6 +225,8 @@ static int max8952_pmic_probe(struct i2c_client *client,
config.of_node = client->dev.of_node;
 
config.ena_gpio = pdata->gpio_en;
+   if (!pdata)
+   config.ena_gpio_initialized = true;
if (pdata->reg_data->constraints.boot_on)
config.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
 
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index adab82d5279f..49b9e1ddc87e 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -897,6 +897,7 @@ common_reg:
config.of_node = rdata[i].of_node;
}
config.ena_gpio = s2mps11->ext_control_gpio[i];
+   config.ena_gpio_initialized = true;
 
regulator = devm_regulator_register(>dev,
[i], );
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 0ab5cbeeb797..7f176cdb7e37 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -466,6 +466,7 @@ static void s5m8767_regulator_config_ext_control(struct 
s5m8767_info *s5m8767,
}
 
config->ena_gpio = rdata->ext_control_gpio;
+   config->ena_gpio_initialized = true;
config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
 }
 
diff --git a/drivers/regulator/tps65090-regulator.c 
b/drivers/regulator/tps65090-regulator.c
index d5df1e9ad1da..2e92aa8718cc 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -312,6 +312,7 @@ static void tps65090_configure_regulator_config(
gpio_flag = GPIOF_OUT_INIT_HIGH;
 
config->ena_gpio = tps_pdata->gpio;
+   config->ena_gpio_initialized = true;
config->ena_gpio_flags = gpio_flag;
}
 }
diff --git a/drivers/regulator/wm8994-regulator.c 
b/drivers/regulator/wm8994-regulator.c
index c24346db8a71..88f5064e412b 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -145,10 +145,12 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
config.driver_data = ldo;
config.regmap = wm8994->regmap;
config.init_data = >init_data;
-   if (pdata)
+   if (pdata) {
config.ena_gpio = 

[PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Markus Pargmann]

This patch sets ena_gpio_initialized for all drivers which set a
ena_gpio from parsed DT properties. Drivers using pdata may get zero
initialized pdata and therefore copy a 0 into the regulator_config
ena_gpio field.

Signed-off-by: Markus Pargmann m...@pengutronix.de
---
 drivers/regulator/arizona-ldo1.c   | 1 +
 drivers/regulator/fixed.c  | 4 +++-
 drivers/regulator/gpio-regulator.c | 4 +++-
 drivers/regulator/max8952.c| 2 ++
 drivers/regulator/s2mps11.c| 1 +
 drivers/regulator/s5m8767.c| 1 +
 drivers/regulator/tps65090-regulator.c | 1 +
 drivers/regulator/wm8994-regulator.c   | 6 --
 8 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 4c9db589f6c1..f4ecf18222d3 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -260,6 +260,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
ret = arizona_ldo1_of_get_pdata(arizona, config);
if (ret  0)
return ret;
+   config.ena_gpio_initialized = true;
}
}
 
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 354105eff1f8..441a3e90e266 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -157,8 +157,10 @@ static int reg_fixed_voltage_probe(struct platform_device 
*pdev)
 
drvdata-desc.fixed_uV = config-microvolts;
 
-   if (config-gpio = 0)
+   if (config-gpio = 0) {
cfg.ena_gpio = config-gpio;
+   cfg.ena_gpio_initialized = true;
+   }
cfg.ena_gpio_invert = !config-enable_high;
if (config-enabled_at_boot) {
if (config-enable_high)
diff --git a/drivers/regulator/gpio-regulator.c 
b/drivers/regulator/gpio-regulator.c
index 989b23b377c0..5da0125fac6a 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -322,8 +322,10 @@ static int gpio_regulator_probe(struct platform_device 
*pdev)
cfg.driver_data = drvdata;
cfg.of_node = np;
 
-   if (config-enable_gpio = 0)
+   if (config-enable_gpio = 0) {
cfg.ena_gpio = config-enable_gpio;
+   cfg.ena_gpio_initialized = true;
+   }
cfg.ena_gpio_invert = !config-enable_high;
if (config-enabled_at_boot) {
if (config-enable_high)
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index f7f9efcfedb7..6d1802b596ec 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -225,6 +225,8 @@ static int max8952_pmic_probe(struct i2c_client *client,
config.of_node = client-dev.of_node;
 
config.ena_gpio = pdata-gpio_en;
+   if (!pdata)
+   config.ena_gpio_initialized = true;
if (pdata-reg_data-constraints.boot_on)
config.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
 
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index adab82d5279f..49b9e1ddc87e 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -897,6 +897,7 @@ common_reg:
config.of_node = rdata[i].of_node;
}
config.ena_gpio = s2mps11-ext_control_gpio[i];
+   config.ena_gpio_initialized = true;
 
regulator = devm_regulator_register(pdev-dev,
regulators[i], config);
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 0ab5cbeeb797..7f176cdb7e37 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -466,6 +466,7 @@ static void s5m8767_regulator_config_ext_control(struct 
s5m8767_info *s5m8767,
}
 
config-ena_gpio = rdata-ext_control_gpio;
+   config-ena_gpio_initialized = true;
config-ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
 }
 
diff --git a/drivers/regulator/tps65090-regulator.c 
b/drivers/regulator/tps65090-regulator.c
index d5df1e9ad1da..2e92aa8718cc 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -312,6 +312,7 @@ static void tps65090_configure_regulator_config(
gpio_flag = GPIOF_OUT_INIT_HIGH;
 
config-ena_gpio = tps_pdata-gpio;
+   config-ena_gpio_initialized = true;
config-ena_gpio_flags = gpio_flag;
}
 }
diff --git a/drivers/regulator/wm8994-regulator.c 
b/drivers/regulator/wm8994-regulator.c
index c24346db8a71..88f5064e412b 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -145,10 +145,12 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
config.driver_data = ldo;
config.regmap = wm8994-regmap;
config.init_data = ldo-init_data;
-   if (pdata)
+   if (pdata) {

Re: [PATCH v2 2/4] regulator: Set ena_gpio_initialized in regulator drivers

[Krzysztof Kozlowski]

On śro, 2014-10-08 at 15:47 +0200, Markus Pargmann wrote:
 This patch sets ena_gpio_initialized for all drivers which set a
 ena_gpio from parsed DT properties. Drivers using pdata may get zero
 initialized pdata and therefore copy a 0 into the regulator_config
 ena_gpio field.
 
 Signed-off-by: Markus Pargmann m...@pengutronix.de

(... rewind to s2m/s5m... I think Mark asked for splitting this per
driver)

 diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
 index adab82d5279f..49b9e1ddc87e 100644
 --- a/drivers/regulator/s2mps11.c
 +++ b/drivers/regulator/s2mps11.c
 @@ -897,6 +897,7 @@ common_reg:
   config.of_node = rdata[i].of_node;
   }
   config.ena_gpio = s2mps11-ext_control_gpio[i];
 + config.ena_gpio_initialized = true;
  
   regulator = devm_regulator_register(pdev-dev,
   regulators[i], config);

Looks good.

 diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
 index 0ab5cbeeb797..7f176cdb7e37 100644
 --- a/drivers/regulator/s5m8767.c
 +++ b/drivers/regulator/s5m8767.c
 @@ -466,6 +466,7 @@ static void s5m8767_regulator_config_ext_control(struct 
 s5m8767_info *s5m8767,
   }
  
   config-ena_gpio = rdata-ext_control_gpio;
 + config-ena_gpio_initialized = true;
   config-ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
  }

It will work fine but a little messy. The 'config' is re-used in loop
for next regulators, so:
1. regulator X with GPIO=-ENODEV, ena_gpio_initialized=false
2. regulator X+1 with real GPIO, ena_gpio_initialized=true
3. regulator X+2 with GPIO=-ENODEV, ena_gpio_initialized=true


Instead do this in probe around line 950:
 config.ena_gpio = -EINVAL;
 config.ena_gpio_flags = 0;
+config-ena_gpio_initialized = true;
 if (gpio_is_valid(pdata-regulators[i].ext_control_gpio))
s5m8767_regulator_config_ext_control(s5m8767,
pdata-regulators[i], config);


Best regards,
Krzysztof

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/