From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933756AbdKBPSC (ORCPT ); Thu, 2 Nov 2017 11:18:02 -0400 Received: from 10.mo68.mail-out.ovh.net ([46.105.79.203]:54816 "EHLO 10.mo68.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933418AbdKBPSB (ORCPT ); Thu, 2 Nov 2017 11:18:01 -0400 X-Greylist: delayed 965 seconds by postgrey-1.27 at vger.kernel.org; Thu, 02 Nov 2017 11:18:01 EDT From: Andi Shyti To: Dmitry Torokhov Cc: Michael Hennerich , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH 4/5] Input: ad7897 - use managed devm_device_add_group Date: Thu, 2 Nov 2017 17:01:35 +0200 Message-Id: <20171102150136.1476-5-andi@etezian.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171102150136.1476-1-andi@etezian.org> References: <20171102150136.1476-1-andi@etezian.org> X-Ovh-Tracer-Id: 3716032643145974426 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedttddrgeeigdeilecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 Signed-off-by: Andi Shyti --- 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