[PATCH] regulator: isl6271a: Allow missing init_data for diagnostics

[PATCH] regulator: isl6271a: Allow missing init_data for diagnostics

[Mark Brown]

The regulator core supports this to allow the configuration to be inspected
at runtime even if no software mangement is enabled.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/regulator/isl6271a-regulator.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index 775f5fd..a0430aa 100644
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -140,6 +140,7 @@ static struct regulator_desc isl_rd[] = {
 static int __devinit isl6271a_probe(struct i2c_client *i2c,
 				     const struct i2c_device_id *id)
 {
+	struct regulator_config config = { };
 	struct regulator_init_data *init_data	= i2c->dev.platform_data;
 	struct isl_pmic *pmic;
 	int err, i;
@@ -147,11 +148,6 @@ static int __devinit isl6271a_probe(struct i2c_client *i2c,
 	if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
 		return -EIO;
 
-	if (!init_data) {
-		dev_err(&i2c->dev, "no platform data supplied\n");
-		return -EIO;
-	}
-
 	pmic = kzalloc(sizeof(struct isl_pmic), GFP_KERNEL);
 	if (!pmic)
 		return -ENOMEM;
-- 
1.7.9.1

Re: [PATCH] regulator: isl6271a: Allow missing init_data for diagnostics

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

On Tue, Apr 03, 2012 at 11:27:16PM +0100, Mark Brown wrote:

>  {
> +	struct regulator_config config = { };
>  	struct regulator_init_data *init_data	= i2c->dev.platform_data;

I've dropped this hunk from the commit locally, it'll reappear later in
another patch (this is why I'm looking at all these drivers...).

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] regulator: isl6271a: Allow missing init_data for diagnostics

[Marek Vasut]

Dear Mark Brown,

> The regulator core supports this to allow the configuration to be inspected
> at runtime even if no software mangement is enabled.

Acked-by: Marek Vasut <marek.vasut@gmail.com>

> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  drivers/regulator/isl6271a-regulator.c |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/regulator/isl6271a-regulator.c
> b/drivers/regulator/isl6271a-regulator.c index 775f5fd..a0430aa 100644
> --- a/drivers/regulator/isl6271a-regulator.c
> +++ b/drivers/regulator/isl6271a-regulator.c
> @@ -140,6 +140,7 @@ static struct regulator_desc isl_rd[] = {
>  static int __devinit isl6271a_probe(struct i2c_client *i2c,
>  				     const struct i2c_device_id *id)
>  {
> +	struct regulator_config config = { };
>  	struct regulator_init_data *init_data	= i2c->dev.platform_data;
>  	struct isl_pmic *pmic;
>  	int err, i;
> @@ -147,11 +148,6 @@ static int __devinit isl6271a_probe(struct i2c_client
> *i2c, if (!i2c_check_functionality(i2c->adapter,
> I2C_FUNC_SMBUS_BYTE_DATA)) return -EIO;
> 
> -	if (!init_data) {
> -		dev_err(&i2c->dev, "no platform data supplied\n");
> -		return -EIO;
> -	}
> -
>  	pmic = kzalloc(sizeof(struct isl_pmic), GFP_KERNEL);
>  	if (!pmic)
>  		return -ENOMEM;

Best regards,
Marek Vasut