Skip to contentSkip to conversation

Input: mms114 - Fix regulator enable and disable paths

PATCH In review Mark Brown 2 participants 3 messages Mar 2, 2013

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 Input: mms114 - Fix regulator enable and disable paths

When it uses regulators the mms114 driver checks to see if it managed to acquire regulators and ignores errors. This is not the intended usage and not great style in general.

Since the driver already refuses to probe if it fails to allocate the regulators simply make the enable and disable calls unconditional and add appropriate error handling.

---
 drivers/input/touchscreen/mms114.c |   31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
drivers/input/touchscreen/mms114.c +23 -8
index 4a29ddf..bb95c89 100644
@@ -314,10 +314,21 @@ static int mms114_start(struct mms114_data *data)
 	struct i2c_client *client = data->client;
 	int error;
 
-	if (data->core_reg)
-		regulator_enable(data->core_reg);
-	if (data->io_reg)
-		regulator_enable(data->io_reg);
+	error = regulator_enable(data->core_reg);
+	if (error != 0) {
+		dev_err(&client->dev, "Failed to enable avdd: %d\n",
+			error);
+		return error;
+	}
+
+	error = regulator_enable(data->io_reg);
+	if (error != 0) {
+		dev_err(&client->dev, "Failed to enable vdd: %d\n",
+			error);
+		regulator_disable(data->core_reg);
+		return error;
+	}
+
 	mdelay(MMS114_POWERON_DELAY);
 
 	error = mms114_setup_regs(data);
@@ -335,16 +346,20 @@ static int mms114_start(struct mms114_data *data)
 static void mms114_stop(struct mms114_data *data)
 {
 	struct i2c_client *client = data->client;
+	int error;
 
 	disable_irq(client->irq);
 
 	if (data->pdata->cfg_pin)
 		data->pdata->cfg_pin(false);
 
-	if (data->io_reg)
-		regulator_disable(data->io_reg);
-	if (data->core_reg)
-		regulator_disable(data->core_reg);
+	error = regulator_disable(data->io_reg);
+	if (error != 0)
+		dev_warn(&client->dev, "Failed to disable vdd: %d\n", error);
+
+	error = regulator_disable(data->core_reg);
+	if (error != 0)
+		dev_warn(&client->dev, "Failed to disable avdd: %d\n", error);
 }
 
 static int mms114_input_open(struct input_dev *dev)
Signature · 1 line
1.7.10.4
#1 lore raw

Hi Mark,

Quoted 7 lines · Mark Brown

When it uses regulators the mms114 driver checks to see if it managed to acquire regulators and ignores errors. This is not the intended usage and not great style in general.

Since the driver already refuses to probe if it fails to allocate the regulators simply make the enable and disable calls unconditional and add appropriate error handling.

Right.

Quoted 11 lines
---
  drivers/input/touchscreen/mms114.c |   31 +++++++++++++++++++++++--------
  1 file changed, 23 insertions(+), 8 deletions(-)
drivers/input/touchscreen/mms114.c +0 -0
index 4a29ddf..bb95c89 100644
@@ -314,10 +314,21 @@ static int mms114_start(struct mms114_data *data)
  	struct i2c_client *client = data->client;

drivers/input/touchscreen/mms114.c static int mms114_start(struct mms114_data *data) · line 320

Quoted 10 lines
drivers/input/touchscreen/mms114.c +4 -4
  	int error;
 
-	if (data->core_reg)
-		regulator_enable(data->core_reg);
-	if (data->io_reg)
-		regulator_enable(data->io_reg);
+	error = regulator_enable(data->core_reg);
+	if (error != 0) {
+		dev_err(&client->dev, "Failed to enable avdd: %d\n",
+			error);

Could you make this to one line?

drivers/input/touchscreen/mms114.c static int mms114_start(struct mms114_data *data) · line 327

Quoted 7 lines
drivers/input/touchscreen/mms114.c +7 -0
+		return error;
+	}
+
+	error = regulator_enable(data->io_reg);
+	if (error != 0) {
+		dev_err(&client->dev, "Failed to enable vdd: %d\n",
+			error);

Ditto.

drivers/input/touchscreen/mms114.c static int mms114_start(struct mms114_data *data) · line 334

Quoted 7 lines
drivers/input/touchscreen/mms114.c +4 -0
+		regulator_disable(data->core_reg);
+		return error;
+	}
+
  	mdelay(MMS114_POWERON_DELAY);
 
  	error = mms114_setup_regs(data);

If error, we will have to disable regulators here.

Quoted 15 lines
drivers/input/touchscreen/mms114.c +1 -4
@@ -335,16 +346,20 @@ static int mms114_start(struct mms114_data *data)
  static void mms114_stop(struct mms114_data *data)
  {
  	struct i2c_client *client = data->client;
+	int error;
 
  	disable_irq(client->irq);
 
  	if (data->pdata->cfg_pin)
  		data->pdata->cfg_pin(false);
 
-	if (data->io_reg)
-		regulator_disable(data->io_reg);
-	if (data->core_reg)
-		regulator_disable(data->core_reg);

drivers/input/touchscreen/mms114.c static int mms114_start(struct mms114_data *data) · line 365

Quoted 10 lines
drivers/input/touchscreen/mms114.c +7 -0
+	error = regulator_disable(data->io_reg);
+	if (error != 0)
+		dev_warn(&client->dev, "Failed to disable vdd: %d\n", error);
+
+	error = regulator_disable(data->core_reg);
+	if (error != 0)
+		dev_warn(&client->dev, "Failed to disable avdd: %d\n", error);
  }
 
  static int mms114_input_open(struct input_dev *dev)

Thanks.

author
#2 lore raw
Quoted 6 lines · Joonyoung Shim

drivers/input/touchscreen/mms114.c static int mms114_start(struct mms114_data *data) · line 334

Quoted 2 lines · Mark Brown
drivers/input/touchscreen/mms114.c +0 -0
 	mdelay(MMS114_POWERON_DELAY);
 	error = mms114_setup_regs(data);

If error, we will have to disable regulators here.

That's a preexisting error, of course...