aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Shyti <andi@etezian.org>2017-09-29 19:42:06 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-09-29 19:51:06 -0400
commite3adf559a33bb0291c5ba7c2d0c02ae438da5c19 (patch)
tree62b8fb16b4b39fe97eb8053671911d86447b9a6e
parent5f2ae04991d08b0f15e5029efff34f6723165b9a (diff)
Input: edt-ft5x06 - 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 relative sysfs_remove_group and goto label. Signed-off-by: Andi Shyti <andi@etezian.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/edt-ft5x06.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 5bf63f76ddda..f879d14f7ffc 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -998,13 +998,13 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
998 return error; 998 return error;
999 } 999 }
1000 1000
1001 error = sysfs_create_group(&client->dev.kobj, &edt_ft5x06_attr_group); 1001 error = devm_device_add_group(&client->dev, &edt_ft5x06_attr_group);
1002 if (error) 1002 if (error)
1003 return error; 1003 return error;
1004 1004
1005 error = input_register_device(input); 1005 error = input_register_device(input);
1006 if (error) 1006 if (error)
1007 goto err_remove_attrs; 1007 return error;
1008 1008
1009 edt_ft5x06_ts_prepare_debugfs(tsdata, dev_driver_string(&client->dev)); 1009 edt_ft5x06_ts_prepare_debugfs(tsdata, dev_driver_string(&client->dev));
1010 device_init_wakeup(&client->dev, 1); 1010 device_init_wakeup(&client->dev, 1);
@@ -1016,10 +1016,6 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
1016 tsdata->reset_gpio ? desc_to_gpio(tsdata->reset_gpio) : -1); 1016 tsdata->reset_gpio ? desc_to_gpio(tsdata->reset_gpio) : -1);
1017 1017
1018 return 0; 1018 return 0;
1019
1020err_remove_attrs:
1021 sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
1022 return error;
1023} 1019}
1024 1020
1025static int edt_ft5x06_ts_remove(struct i2c_client *client) 1021static int edt_ft5x06_ts_remove(struct i2c_client *client)
@@ -1027,7 +1023,6 @@ static int edt_ft5x06_ts_remove(struct i2c_client *client)
1027 struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client); 1023 struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
1028 1024
1029 edt_ft5x06_ts_teardown_debugfs(tsdata); 1025 edt_ft5x06_ts_teardown_debugfs(tsdata);
1030 sysfs_remove_group(&client->dev.kobj, &edt_ft5x06_attr_group);
1031 1026
1032 return 0; 1027 return 0;
1033} 1028}