Skip to contentSkip to conversation

Input: adp5588-keys - Use devm_regulator_get_enable()

PATCH Applied Christophe JAILLET 3 participants 3 messages Jun 17, 2023 – Jul 8, 2023

Subsystems (4)
Kernel janitors HID Input drivers ADP5588 qwerty keypad and io expander driver (ADP5588/ADP5587)
lore
Share & tools
lore

Christophe JAILLET

author
#0 lore raw

PATCH 1/1 Input: adp5588-keys - Use devm_regulator_get_enable()

Use devm_regulator_get_enable() instead of hand writing it. It saves some line of code.

Signed-off-by Christophe JAILLET <[email protected]>
---
 drivers/input/keyboard/adp5588-keys.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/input/keyboard/adp5588-keys.c +1 -16
index 896a5a989ddc..61e8e43e9c2b 100644
@@ -713,17 +713,11 @@ static int adp5588_fw_parse(struct adp5588_kpad *kpad)
 	return 0;
 }
 
-static void adp5588_disable_regulator(void *reg)
-{
-	regulator_disable(reg);
-}
-
 static int adp5588_probe(struct i2c_client *client)
 {
 	struct adp5588_kpad *kpad;
 	struct input_dev *input;
 	struct gpio_desc *gpio;
-	struct regulator *vcc;
 	unsigned int revid;
 	int ret;
 	int error;

@@ -749,16 +743,7 @@ static int adp5588_probe(struct i2c_client *client)
 	if (error)
 		return error;
 
-	vcc = devm_regulator_get(&client->dev, "vcc");
-	if (IS_ERR(vcc))
-		return PTR_ERR(vcc);
-
-	error = regulator_enable(vcc);
-	if (error)
-		return error;
-
-	error = devm_add_action_or_reset(&client->dev,
-					 adp5588_disable_regulator, vcc);
+	error = devm_regulator_get_enable(&client->dev, "vcc");
 	if (error)
 		return error;
Signature · 1 line
2.34.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines

-----Original Message-----
From: Christophe JAILLET <[email protected]>
Sent: Samstag, 17. Juni 2023 09:12
To: Hennerich, Michael <[email protected]>; Dmitry Torokhov <[email protected]>
Cc: [email protected]; [email protected]; Christophe JAILLET <[email protected]>; [email protected]
Subject: [PATCH] Input: adp5588-keys - Use devm_regulator_get_enable()

Quoted 4 lines

Use devm_regulator_get_enable() instead of hand writing it. It saves some line of code.

Signed-off-by Christophe JAILLET <[email protected]>
Acked-by Michael Hennerich <[email protected]>
Quoted 46 lines
---
 drivers/input/keyboard/adp5588-keys.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/input/keyboard/adp5588-keys.c +1 -16
index 896a5a989ddc..61e8e43e9c2b 100644
@@ -713,17 +713,11 @@ static int adp5588_fw_parse(struct adp5588_kpad
 *kpad)
 	return 0;
 }
 
-static void adp5588_disable_regulator(void *reg) -{
-	regulator_disable(reg);
-}
-
 static int adp5588_probe(struct i2c_client *client)  {
 	struct adp5588_kpad *kpad;
 	struct input_dev *input;
 	struct gpio_desc *gpio;
-	struct regulator *vcc;
 	unsigned int revid;
 	int ret;
 	int error;

@@ -749,16 +743,7 @@ static int adp5588_probe(struct i2c_client *client)
 	if (error)
 		return error;
 
-	vcc = devm_regulator_get(&client->dev, "vcc");
-	if (IS_ERR(vcc))
-		return PTR_ERR(vcc);
-
-	error = regulator_enable(vcc);
-	if (error)
-		return error;
-
-	error = devm_add_action_or_reset(&client->dev,
-					 adp5588_disable_regulator, vcc);
+	error = devm_regulator_get_enable(&client->dev, "vcc");
 	if (error)
 		return error;
 
--

2.34.1