From 4c16f82e23654438ac33bab746320e8dcc069501 Mon Sep 17 00:00:00 2001 From: Andi Shyti Date: Fri, 29 Sep 2017 16:38:23 -0700 Subject: Input: melfas_mip4 - use managed devm_device_add_group Commit 57b8ff070f98 ("driver core: add devm_device_add_group() and friends") has added the managed version for creating sysfs group files. Use devm_device_add_group instead of sysfs_create_group and remove the action that cleans the sysfs file when exiting the driver. Signed-off-by: Andi Shyti Signed-off-by: Dmitry Torokhov --- drivers/input/touchscreen/melfas_mip4.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'drivers/input/touchscreen') diff --git a/drivers/input/touchscreen/melfas_mip4.c b/drivers/input/touchscreen/melfas_mip4.c index 05108c2fea93..6892f0e28918 100644 --- a/drivers/input/touchscreen/melfas_mip4.c +++ b/drivers/input/touchscreen/melfas_mip4.c @@ -1433,13 +1433,6 @@ static const struct attribute_group mip4_attr_group = { .attrs = mip4_attrs, }; -static void mip4_sysfs_remove(void *_data) -{ - struct mip4_ts *ts = _data; - - sysfs_remove_group(&ts->client->dev.kobj, &mip4_attr_group); -} - static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct mip4_ts *ts; @@ -1535,21 +1528,13 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) return error; } - error = sysfs_create_group(&client->dev.kobj, &mip4_attr_group); + error = devm_device_add_group(&client->dev, &mip4_attr_group); if (error) { dev_err(&client->dev, "Failed to create sysfs attribute group: %d\n", error); return error; } - error = devm_add_action(&client->dev, mip4_sysfs_remove, ts); - if (error) { - mip4_sysfs_remove(ts); - dev_err(&client->dev, - "Failed to install sysfs remoce action: %d\n", error); - return error; - } - return 0; } -- cgit v1.2.3-59-g8ed1b