Skip to contentSkip to conversation

regulator: lp8755: Don't show unrelated messags in lp8755_probe error paths

PATCH Applied Axel Lin 3 participants 3 messages Jan 12, 2013 – Jan 17, 2013 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: lp8755: Don't show unrelated messags in lp8755_probe error paths

Signed-off-by Axel Lin <[email protected]>
---
 drivers/regulator/lp8755.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/regulator/lp8755.c +10 -9
index decb3ad..8c3f3f2 100644
@@ -497,35 +497,36 @@ static int lp8755_probe(struct i2c_client *client,
 		if (!pchip->pdata)
 			return -ENOMEM;
 		ret = lp8755_init_data(pchip);
-		if (ret < 0)
-			goto err_chip_init;
+		if (ret < 0) {
+			dev_err(&client->dev, "fail to initialize chip\n");
+			return ret;
+		}
 	}
 
 	ret = lp8755_regulator_init(pchip);
-	if (ret < 0)
+	if (ret < 0) {
+		dev_err(&client->dev, "fail to initialize regulators\n");
 		goto err_regulator;
+	}
 
 	pchip->irq = client->irq;
 	ret = lp8755_int_config(pchip);
-	if (ret < 0)
+	if (ret < 0) {
+		dev_err(&client->dev, "fail to irq config\n");
 		goto err_irq;
+	}
 
 	return ret;
 
 err_irq:
-	dev_err(&client->dev, "fail to irq config\n");
-
 	for (icnt = 0; icnt < mphase_buck[pchip->mphase].nreg; icnt++)
 		regulator_unregister(pchip->rdev[icnt]);
 
 err_regulator:
-	dev_err(&client->dev, "fail to initialize regulators\n");
 	/* output disable */
 	for (icnt = 0; icnt < 0x06; icnt++)
 		lp8755_write(pchip, icnt, 0x00);
 
-err_chip_init:
-	dev_err(&client->dev, "fail to initialize chip\n");
 	return ret;
 }
Signature · 1 line
1.7.9.5
#1 lore raw

2013년 01월 12일 15:58, Axel Lin 쓴 글:

Quoted 45 lines
Signed-off-by Axel Lin<[email protected]>
---
  drivers/regulator/lp8755.c |   19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
drivers/regulator/lp8755.c +10 -6
index decb3ad..8c3f3f2 100644
@@ -497,35 +497,36 @@ static int lp8755_probe(struct i2c_client *client,
  		if (!pchip->pdata)
  			return -ENOMEM;
  		ret = lp8755_init_data(pchip);
-		if (ret < 0)
-			goto err_chip_init;
+		if (ret < 0) {
+			dev_err(&client->dev, "fail to initialize chip\n");
+			return ret;
+		}
  	}
 
  	ret = lp8755_regulator_init(pchip);
-	if (ret < 0)
+	if (ret < 0) {
+		dev_err(&client->dev, "fail to initialize regulators\n");
  		goto err_regulator;
+	}
 
  	pchip->irq = client->irq;
  	ret = lp8755_int_config(pchip);
-	if (ret < 0)
+	if (ret < 0) {
+		dev_err(&client->dev, "fail to irq config\n");
  		goto err_irq;
+	}
 
  	return ret;
 
  err_irq:
-	dev_err(&client->dev, "fail to irq config\n");
-
  	for (icnt = 0; icnt < mphase_buck[pchip->mphase].nreg; icnt++)
  		regulator_unregister(pchip->rdev[icnt]);
 
  err_regulator:

drivers/regulator/lp8755.c static int lp8755_probe(struct i2c_client *client, · line 532

Quoted 10 lines
drivers/regulator/lp8755.c +0 -3
-	dev_err(&client->dev, "fail to initialize regulators\n");
  	/* output disable */
  	for (icnt = 0; icnt < 0x06; icnt++)
  		lp8755_write(pchip, icnt, 0x00);
 
-err_chip_init:
-	dev_err(&client->dev, "fail to initialize chip\n");
  	return ret;
  }

It is nice to us also and this patch was tested using a lp8755 board. Thank you Axel.