From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Andi Shyti <andi@etezian.org>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Andi Shyti <andi.shyti@samsung.com>
Subject: Re: [PATCH 03/12] Input: ads7846 - use managed devm_device_add_group
Date: Fri, 29 Sep 2017 16:46:27 -0700 [thread overview]
Message-ID: <20170929234627.GL14362@dtor-ws> (raw)
In-Reply-To: <20170929203839.7010-4-andi@etezian.org>
On Sat, Sep 30, 2017 at 05:38:30AM +0900, Andi Shyti wrote:
> 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/ads7846.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
> index a2f45aefce08..597f4a2cca42 100644
> --- a/drivers/input/touchscreen/ads7846.c
> +++ b/drivers/input/touchscreen/ads7846.c
> @@ -1416,13 +1416,13 @@ static int ads7846_probe(struct spi_device *spi)
> else
> (void) ads7846_read12_ser(&spi->dev, READ_12BIT_SER(vaux));
>
> - err = sysfs_create_group(&spi->dev.kobj, &ads784x_attr_group);
> + err = devm_device_add_group(&spi->dev, &ads784x_attr_group);
> if (err)
> goto err_remove_hwmon;
>
> err = input_register_device(input_dev);
> if (err)
> - goto err_remove_attr_group;
> + goto err_remove_hwmon;
>
> device_init_wakeup(&spi->dev, pdata->wakeup);
>
> @@ -1435,8 +1435,6 @@ static int ads7846_probe(struct spi_device *spi)
>
> return 0;
>
> - err_remove_attr_group:
> - sysfs_remove_group(&spi->dev.kobj, &ads784x_attr_group);
> err_remove_hwmon:
> ads784x_hwmon_unregister(spi, ts);
> err_free_irq:
> @@ -1462,8 +1460,6 @@ static int ads7846_remove(struct spi_device *spi)
> {
> struct ads7846 *ts = spi_get_drvdata(spi);
>
> - sysfs_remove_group(&spi->dev.kobj, &ads784x_attr_group);
> -
Wrong ordering.
> ads7846_disable(ts);
> free_irq(ts->spi->irq, ts);
>
> --
> 2.14.2
>
--
Dmitry
next prev parent reply other threads:[~2017-09-29 23:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-29 20:38 [PATCH 00/12] use managed devm_device_add_group for all touchscreen drivers Andi Shyti
2017-09-29 20:38 ` [PATCH 01/12] Input: ad7897 - use managed devm_device_add_group Andi Shyti
2017-09-29 23:32 ` Dmitry Torokhov
2017-10-27 6:11 ` Andi Shyti
2017-09-29 20:38 ` [PATCH 02/12] Input: ad7879 " Andi Shyti
2017-09-29 23:48 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 03/12] Input: ads7846 " Andi Shyti
2017-09-29 23:46 ` Dmitry Torokhov [this message]
2017-09-29 20:38 ` [PATCH 04/12] Input: atmel_mxt_ts " Andi Shyti
2017-09-29 23:46 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 05/12] Input: edt-ft5x06 " Andi Shyti
2017-09-29 23:42 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 06/12] Input: elants_i2c " Andi Shyti
2017-09-29 23:38 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 07/12] Input: ili210x " Andi Shyti
2017-09-29 23:45 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 08/12] Input: melfas_mip4 " Andi Shyti
2017-09-29 23:38 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 09/12] Input: raydium_i2c_ts " Andi Shyti
2017-09-29 23:39 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 10/12] Input: rohm_bu21023 " Andi Shyti
2017-09-29 23:39 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 11/12] Input: tsc200x-core " Andi Shyti
2017-09-29 23:44 ` Dmitry Torokhov
2017-09-29 20:38 ` [PATCH 12/12] Input: wdt87xx_i2c " Andi Shyti
2017-09-29 23:41 ` Dmitry Torokhov
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=20170929234627.GL14362@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=andi.shyti@samsung.com \
--cc=andi@etezian.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).