| Message ID | af343b5b0d740cc9f8863264c30e3da4215721d7.1686985911.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 26ab82616eb51bd236f12d6427d05d18c573f6e2 |
| Headers | show |
| Series | Input: adp5588-keys - Use devm_regulator_get_enable() | expand |
> -----Original Message----- > From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Sent: Samstag, 17. Juni 2023 09:12 > To: Hennerich, Michael <Michael.Hennerich@analog.com>; Dmitry Torokhov > <dmitry.torokhov@gmail.com> > Cc: linux-kernel@vger.kernel.org; kernel-janitors@vger.kernel.org; Christophe > JAILLET <christophe.jaillet@wanadoo.fr>; linux-input@vger.kernel.org > Subject: [PATCH] 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 <christophe.jaillet@wanadoo.fr> Acked-by: Michael Hennerich <michael.hennerich@analog.com> > --- > drivers/input/keyboard/adp5588-keys.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/drivers/input/keyboard/adp5588-keys.c > b/drivers/input/keyboard/adp5588-keys.c > index 896a5a989ddc..61e8e43e9c2b 100644 > --- a/drivers/input/keyboard/adp5588-keys.c > +++ b/drivers/input/keyboard/adp5588-keys.c > @@ -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
On Sat, Jun 17, 2023 at 09:12:03AM +0200, Christophe JAILLET wrote: > 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> Applied, thank you.
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 896a5a989ddc..61e8e43e9c2b 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c @@ -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;
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> --- drivers/input/keyboard/adp5588-keys.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)