Skip to content

Commit

Permalink
Input: adp5588-keys - use devm_regulator_get_enable()
Browse files Browse the repository at this point in the history
Use devm_regulator_get_enable() instead of hand writing it. It saves some
line of code.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Link: https://lore.kernel.org/r/af343b5b0d740cc9f8863264c30e3da4215721d7.1686985911.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Christophe JAILLET authored and Dmitry Torokhov committed Jul 8, 2023
1 parent 3ce6e06 commit 26ab826
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions drivers/input/keyboard/adp5588-keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down

0 comments on commit 26ab826

Please sign in to comment.