From patchwork Fri Sep 29 20:38:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 9978673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2113060329 for ; Fri, 29 Sep 2017 20:58:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14936298BC for ; Fri, 29 Sep 2017 20:58:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09722298BD; Fri, 29 Sep 2017 20:58:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4075D298B9 for ; Fri, 29 Sep 2017 20:58:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752542AbdI2U5j (ORCPT ); Fri, 29 Sep 2017 16:57:39 -0400 Received: from 14.mo6.mail-out.ovh.net ([46.105.56.113]:48479 "EHLO 14.mo6.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752543AbdI2U5f (ORCPT ); Fri, 29 Sep 2017 16:57:35 -0400 Received: from player761.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo6.mail-out.ovh.net (Postfix) with ESMTP id 6325E112CCC for ; Fri, 29 Sep 2017 22:40:28 +0200 (CEST) Received: from etezian.org (unknown [103.14.185.112]) (Authenticated sender: andi@etezian.org) by player761.ha.ovh.net (Postfix) with ESMTPSA id 1221D48006C; Fri, 29 Sep 2017 22:40:20 +0200 (CEST) From: Andi Shyti To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti , Sangwon Jee Subject: [PATCH 08/12] Input: melfas_mip4 - use managed devm_device_add_group Date: Sat, 30 Sep 2017 05:38:35 +0900 Message-Id: <20170929203839.7010-9-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: 12662996255019352730 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelledrjeekgdduheefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. CC: Sangwon Jee Signed-off-by: Andi Shyti --- drivers/input/touchscreen/melfas_mip4.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/input/touchscreen/melfas_mip4.c b/drivers/input/touchscreen/melfas_mip4.c index 05108c2fea93..6892f0e28918 100644 --- a/drivers/input/touchscreen/melfas_mip4.c +++ b/drivers/input/touchscreen/melfas_mip4.c @@ -1433,13 +1433,6 @@ static const struct attribute_group mip4_attr_group = { .attrs = mip4_attrs, }; -static void mip4_sysfs_remove(void *_data) -{ - struct mip4_ts *ts = _data; - - sysfs_remove_group(&ts->client->dev.kobj, &mip4_attr_group); -} - static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct mip4_ts *ts; @@ -1535,21 +1528,13 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) return error; } - error = sysfs_create_group(&client->dev.kobj, &mip4_attr_group); + error = devm_device_add_group(&client->dev, &mip4_attr_group); if (error) { dev_err(&client->dev, "Failed to create sysfs attribute group: %d\n", error); return error; } - error = devm_add_action(&client->dev, mip4_sysfs_remove, ts); - if (error) { - mip4_sysfs_remove(ts); - dev_err(&client->dev, - "Failed to install sysfs remoce action: %d\n", error); - return error; - } - return 0; }