From: Andi Shyti <andi@etezian.org>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Andi Shyti <andi@etezian.org>,
Andi Shyti <andi.shyti@samsung.com>
Subject: [PATCH 4/5] Input: ad7897 - use managed devm_device_add_group
Date: Thu, 2 Nov 2017 17:01:35 +0200 [thread overview]
Message-ID: <20171102150136.1476-5-andi@etezian.org> (raw)
In-Reply-To: <20171102150136.1476-1-andi@etezian.org>
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.
CC: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Andi Shyti <andi@etezian.org>
---
drivers/input/touchscreen/ad7877.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c
index 3a4230219b23..c8a143db8681 100644
--- a/drivers/input/touchscreen/ad7877.c
+++ b/drivers/input/touchscreen/ad7877.c
@@ -780,28 +780,17 @@ static int ad7877_probe(struct spi_device *spi)
return err;
}
- err = sysfs_create_group(&spi->dev.kobj, &ad7877_attr_group);
+ err = devm_device_add_group(&spi->dev, &ad7877_attr_group);
if (err)
return err;
- err = input_register_device(input_dev);
- if (err)
- goto err_remove_attr_group;
-
- return 0;
-
-err_remove_attr_group:
- sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);
-
- return err;
+ return input_register_device(input_dev);
}
static int ad7877_remove(struct spi_device *spi)
{
struct ad7877 *ts = spi_get_drvdata(spi);
- sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);
-
ad7877_disable(ts);
dev_dbg(&spi->dev, "unregistered touchscreen\n");
--
2.15.0
next prev parent reply other threads:[~2017-11-02 15:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 15:01 [PATCH 0/5] use managed functions for ad7897 driver Andi Shyti
2017-11-02 15:01 ` [PATCH 1/5] Input: ad7897 - use managed devm_kzalloc Andi Shyti
2017-11-02 15:01 ` [PATCH 2/5] Input: ad7897 - use managed devm_input_allocate_device Andi Shyti
2017-11-02 15:01 ` [PATCH 3/5] Input: ad7897 - use managed devm_request_threaded_irq Andi Shyti
2017-11-02 15:01 ` Andi Shyti [this message]
2017-11-03 0:02 ` [PATCH 4/5] Input: ad7897 - use managed devm_device_add_group Dmitry Torokhov
2017-11-02 15:01 ` [PATCH 5/5] Input: ad7897 - use separate error handling for different allocators Andi Shyti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171102150136.1476-5-andi@etezian.org \
--to=andi@etezian.org \
--cc=andi.shyti@samsung.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.hennerich@analog.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®