[v2,1/2] Input: elan_i2c - Move regulator_[en|dis]able() out of elan_[en|dis]able_power()

Commit Message

Hans de Goede Jan. 31, 2022, 1:54 p.m. UTC

elan_disable_power() is called conditionally on suspend, where as
elan_enable_power() is always called on resume. This leads to
an imbalance in the regulator's enable count.

Move the regulator_[en|dis]able() calls out of elan_[en|dis]able_power()
in preparation of fixing this.

No functional changes intended.

Signed-off-by: Hans de Goede <[e-mail]>
---
Changes in v2:
- New patch in v2 of this patch-set
---
 drivers/input/mouse/elan_i2c_core.c | 36 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 19 deletions(-)

Patch

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 47af62c12267..d8965f3c6bf5 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -191,13 +191,6 @@  static int elan_enable_power(struct elan_tp_data *data)
 	int repeat = ETP_RETRY_COUNT;
 	int error;
 
-	error = regulator_enable(data->vcc);
-	if (error) {
-		dev_err(&data->client->dev,
-			"failed to enable regulator: %d\n", error);
-		return error;
-	}
-
 	do {
 		error = data->ops->power_control(data->client, true);
 		if (error >= 0)
@@ -217,19 +210,8 @@  static int elan_disable_power(struct elan_tp_data *data)
 
 	do {
 		error = data->ops->power_control(data->client, false);
-		if (!error) {
-			error = regulator_disable(data->vcc);
-			if (error) {
-				dev_err(&data->client->dev,
-					"failed to disable regulator: %d\n",
-					error);
-				/* Attempt to power the chip back up */
-				data->ops->power_control(data->client, true);
-				break;
-			}
-
+		if (!error)
 			return 0;
-		}
 
 		msleep(30);
 	} while (--repeat > 0);
@@ -1400,8 +1382,18 @@  static int __maybe_unused elan_suspend(struct device *dev)
 		data->irq_wake = (enable_irq_wake(client->irq) == 0);
 	} else {
 		ret = elan_disable_power(data);
+		if (ret)
+			goto err;
+
+		ret = regulator_disable(data->vcc);
+		if (ret) {
+			dev_err(dev, "error %d disabling regulator\n", ret);
+			/* Attempt to power the chip back up */
+			elan_enable_power(data);
+		}
 	}
 
+err:
 	mutex_unlock(&data->sysfs_mutex);
 	return ret;
 }
@@ -1417,6 +1409,12 @@  static int __maybe_unused elan_resume(struct device *dev)
 		data->irq_wake = false;
 	}
 
+	error = regulator_enable(data->vcc);
+	if (error) {
+		dev_err(dev, "error %d enabling regulator\n", error);
+		goto err;
+	}
+
 	error = elan_enable_power(data);
 	if (error) {
 		dev_err(dev, "power up when resuming failed: %d\n", error);