Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbdI2Xqd (ORCPT ); Fri, 29 Sep 2017 19:46:33 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:37019 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbdI2Xqb (ORCPT ); Fri, 29 Sep 2017 19:46:31 -0400 X-Google-Smtp-Source: AOwi7QCkvGX1CaD2VxoesHnL2a2AiTXZ5ZtesxtluPag65Nh4xUP479c2cHWQFdYiJka4VNYWE2tQw== Date: Fri, 29 Sep 2017 16:46:27 -0700 From: Dmitry Torokhov To: Andi Shyti Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti Subject: Re: [PATCH 03/12] Input: ads7846 - use managed devm_device_add_group Message-ID: <20170929234627.GL14362@dtor-ws> References: <20170929203839.7010-1-andi@etezian.org> <20170929203839.7010-4-andi@etezian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170929203839.7010-4-andi@etezian.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1784 Lines: 60 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 > --- > 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