From patchwork Fri Sep 29 20:38:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 9978663 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 020C060329 for ; Fri, 29 Sep 2017 20:57:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE93F298B9 for ; Fri, 29 Sep 2017 20:57:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D363D298BC; Fri, 29 Sep 2017 20:57:30 +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 463AE298B9 for ; Fri, 29 Sep 2017 20:57:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752157AbdI2U53 (ORCPT ); Fri, 29 Sep 2017 16:57:29 -0400 Received: from 12.mo6.mail-out.ovh.net ([178.32.125.228]:51142 "EHLO 12.mo6.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092AbdI2U52 (ORCPT ); Fri, 29 Sep 2017 16:57:28 -0400 X-Greylist: delayed 982 seconds by postgrey-1.27 at vger.kernel.org; Fri, 29 Sep 2017 16:57:28 EDT Received: from player761.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo6.mail-out.ovh.net (Postfix) with ESMTP id 24C7F112CCB for ; Fri, 29 Sep 2017 22:40:18 +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 9D0FF48006C; Fri, 29 Sep 2017 22:40:11 +0200 (CEST) From: Andi Shyti To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH 07/12] Input: ili210x - use managed devm_device_add_group Date: Sat, 30 Sep 2017 05:38:34 +0900 Message-Id: <20170929203839.7010-8-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: 12660181504047104666 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 relative sysfs_remove_group and goto label. Signed-off-by: Andi Shyti --- drivers/input/touchscreen/ili210x.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c index 6f76eeedf465..03a6aca2941f 100644 --- a/drivers/input/touchscreen/ili210x.c +++ b/drivers/input/touchscreen/ili210x.c @@ -266,7 +266,7 @@ static int ili210x_i2c_probe(struct i2c_client *client, goto err_free_mem; } - error = sysfs_create_group(&dev->kobj, &ili210x_attr_group); + error = devm_device_add_group(dev, &ili210x_attr_group); if (error) { dev_err(dev, "Unable to create sysfs attributes, err: %d\n", error); @@ -276,7 +276,7 @@ static int ili210x_i2c_probe(struct i2c_client *client, error = input_register_device(priv->input); if (error) { dev_err(dev, "Cannot register input device, err: %d\n", error); - goto err_remove_sysfs; + goto err_free_irq; } device_init_wakeup(dev, 1); @@ -287,8 +287,6 @@ static int ili210x_i2c_probe(struct i2c_client *client, return 0; -err_remove_sysfs: - sysfs_remove_group(&dev->kobj, &ili210x_attr_group); err_free_irq: free_irq(client->irq, priv); err_free_mem: @@ -301,7 +299,6 @@ static int ili210x_i2c_remove(struct i2c_client *client) { struct ili210x *priv = i2c_get_clientdata(client); - sysfs_remove_group(&client->dev.kobj, &ili210x_attr_group); free_irq(priv->client->irq, priv); cancel_delayed_work_sync(&priv->dwork); input_unregister_device(priv->input);