Input: elan_i2c - switch to using devm_device_add_groups()
Subsystems (2)
Dmitry Torokhov
maintainerPATCH 1/1 Input: elan_i2c - switch to using devm_device_add_groups()
Instead of installing custom devm cleanup action to remove attribute groups on failure, let's use the dedicated devm API.
Signed-off-by Dmitry Torokhov <[email protected]>
--- drivers/input/mouse/elan_i2c_core.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/input/mouse/elan_i2c_core.c +1 -16
@@ -1138,13 +1138,6 @@ static void elan_disable_regulator(void *_data)regulator_disable (data->vcc); } -static void elan_remove_sysfs_groups (void *_data) -{ -struct elan_tp_data *data = _data; - -sysfs_remove_groups (&data->client->dev.kobj, elan_sysfs_groups); -} -static int elan_probe (struct i2c_client *client,const struct i2c_device_id *dev_id) {
@@ -1269,20 +1262,12 @@ static int elan_probe(struct i2c_client *client,return error; } - error =sysfs_create_groups (&dev->kobj, elan_sysfs_groups); + error =devm_device_add_groups (dev, elan_sysfs_groups);if (error) {dev_err (dev,"failed to create sysfs attributes: %d\n" , error);return error; } - error =devm_add_action (dev, elan_remove_sysfs_groups, data); -if (error) { -elan_remove_sysfs_groups (data); -dev_err (dev,"Failed to add sysfs cleanup action: %d\n" , - error); -return error; - } - error =input_register_device (data->input);if (error) {dev_err (dev,"failed to register input device: %d\n" , error);
Signature · 5 lines
2.22.0.510.g264f2c817a-goog -- Dmitry