Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752579AbdI2U5i (ORCPT ); Fri, 29 Sep 2017 16:57:38 -0400 Received: from 1.mo6.mail-out.ovh.net ([46.105.56.136]:41007 "EHLO 1.mo6.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752557AbdI2U5g (ORCPT ); Fri, 29 Sep 2017 16:57:36 -0400 From: Andi Shyti To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH 10/12] Input: rohm_bu21023 - use managed devm_device_add_group Date: Sat, 30 Sep 2017 05:38:37 +0900 Message-Id: <20170929203839.7010-11-andi@etezian.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20170929203839.7010-1-andi@etezian.org> References: <20170929203839.7010-1-andi@etezian.org> X-Ovh-Tracer-Id: 12668344279128457882 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelledrjeekgdduheefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1603 Lines: 55 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 action that cleans the sysfs file when exiting the driver. Signed-off-by: Andi Shyti --- drivers/input/touchscreen/rohm_bu21023.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/input/touchscreen/rohm_bu21023.c b/drivers/input/touchscreen/rohm_bu21023.c index eeaf6ff03597..bda0500c9b57 100644 --- a/drivers/input/touchscreen/rohm_bu21023.c +++ b/drivers/input/touchscreen/rohm_bu21023.c @@ -1103,13 +1103,6 @@ static void rohm_ts_close(struct input_dev *input_dev) ts->initialized = false; } -static void rohm_ts_remove_sysfs_group(void *_dev) -{ - struct device *dev = _dev; - - sysfs_remove_group(&dev->kobj, &rohm_ts_attr_group); -} - static int rohm_bu21023_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1180,20 +1173,12 @@ static int rohm_bu21023_i2c_probe(struct i2c_client *client, return error; } - error = sysfs_create_group(&dev->kobj, &rohm_ts_attr_group); + error = devm_device_add_group(dev, &rohm_ts_attr_group); if (error) { dev_err(dev, "failed to create sysfs group: %d\n", error); return error; } - error = devm_add_action(dev, rohm_ts_remove_sysfs_group, dev); - if (error) { - rohm_ts_remove_sysfs_group(dev); - dev_err(dev, "Failed to add sysfs cleanup action: %d\n", - error); - return error; - } - return error; } -- 2.14.2