Skip to content

Commit

Permalink
Input: adp5589-keys - use devm_add_action_or_reset() for register clear
Browse files Browse the repository at this point in the history
The driver clears the general configuration register during the remove()
hook. This should also be done in case the driver exits on error.

This change move the clear of that register to the
devm_add_action_or_reset() hook.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201112074308.71351-6-alexandru.ardelean@analog.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
commodo authored and dtor committed Nov 19, 2020
1 parent 74f2c59 commit 30df385
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions drivers/input/keyboard/adp5589-keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,14 @@ static int adp5589_keypad_add(struct adp5589_kpad *kpad, unsigned int revid)
return 0;
}

static void adp5589_clear_config(void *data)
{
struct i2c_client *client = data;
struct adp5589_kpad *kpad = i2c_get_clientdata(client);

adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
}

static int adp5589_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
Expand Down Expand Up @@ -974,6 +982,11 @@ static int adp5589_probe(struct i2c_client *client,
break;
}

error = devm_add_action_or_reset(&client->dev, adp5589_clear_config,
client);
if (error)
return error;

ret = adp5589_read(client, ADP5589_5_ID);
if (ret < 0)
return ret;
Expand Down Expand Up @@ -1003,15 +1016,6 @@ static int adp5589_probe(struct i2c_client *client,
return 0;
}

static int adp5589_remove(struct i2c_client *client)
{
struct adp5589_kpad *kpad = i2c_get_clientdata(client);

adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);

return 0;
}

#ifdef CONFIG_PM_SLEEP
static int adp5589_suspend(struct device *dev)
{
Expand Down Expand Up @@ -1063,7 +1067,6 @@ static struct i2c_driver adp5589_driver = {
.pm = &adp5589_dev_pm_ops,
},
.probe = adp5589_probe,
.remove = adp5589_remove,
.id_table = adp5589_id,
};

Expand Down

0 comments on commit 30df385

Please sign in to comment.