Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1742350

[PATCH 07/12] Input: ili210x - use managed devm_device_add_group

Show all headers | View raw

Commit 57b8ff070f98 ("driver core: add devm_device_add_group()
and friends") has added the 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>
---
 drivers/input/touchscreen/ili210x.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 6f76eeedf465..03a6aca2941f 100644
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -266,7 +266,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
 		goto err_free_mem;
 	}
 
-	error = sysfs_create_group(&dev->kobj, &ili210x_attr_group);
+	error = devm_device_add_group(dev, &ili210x_attr_group);
 	if (error) {
 		dev_err(dev, "Unable to create sysfs attributes, err: %d\n",
 			error);
@@ -276,7 +276,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
 	error = input_register_device(priv->input);
 	if (error) {
 		dev_err(dev, "Cannot register input device, err: %d\n", error);
-		goto err_remove_sysfs;
+		goto err_free_irq;
 	}
 
 	device_init_wakeup(dev, 1);
@@ -287,8 +287,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
 
 	return 0;
 
-err_remove_sysfs:
-	sysfs_remove_group(&dev->kobj, &ili210x_attr_group);
 err_free_irq:
 	free_irq(client->irq, priv);
 err_free_mem:
@@ -301,7 +299,6 @@ static int ili210x_i2c_remove(struct i2c_client *client)
 {
 	struct ili210x *priv = i2c_get_clientdata(client);
 
-	sysfs_remove_group(&client->dev.kobj, &ili210x_attr_group);
 	free_irq(priv->client->irq, priv);
 	cancel_delayed_work_sync(&priv->dwork);
 	input_unregister_device(priv->input);
-- 
2.14.2

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 07/12] Input: ili210x - use managed devm_device_add_group Andi Shyti <andi@etezian.org> - 2017-09-29 23:00 +0200
  Re: [PATCH 07/12] Input: ili210x - use managed devm_device_add_group Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-09-30 01:50 +0200

csiph-web