From patchwork Fri Jun 19 10:35:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 6644041 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2DBE39F326 for ; Fri, 19 Jun 2015 10:36:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4231D206D6 for ; Fri, 19 Jun 2015 10:36:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A115C206CC for ; Fri, 19 Jun 2015 10:36:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753991AbbFSKf7 (ORCPT ); Fri, 19 Jun 2015 06:35:59 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:37015 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753964AbbFSKf7 (ORCPT ); Fri, 19 Jun 2015 06:35:59 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Z5teQ-0003pA-3H; Fri, 19 Jun 2015 12:35:58 +0200 Received: from mgr by dude.hi.pengutronix.de with local (Exim 4.85) (envelope-from ) id 1Z5teP-0008QU-T3; Fri, 19 Jun 2015 12:35:57 +0200 From: Michael Grzeschik To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org Subject: [PATCH] pcf8574_keypad: use request_devm_threaded_irq Date: Fri, 19 Jun 2015 12:35:54 +0200 Message-Id: <1434710154-25834-1-git-send-email-m.grzeschik@pengutronix.de> X-Mailer: git-send-email 2.1.4 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mgr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We can use the devres API here. Remove the extra cleanup codepath. Signed-off-by: Michael Grzeschik --- drivers/input/misc/pcf8574_keypad.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c index 97f711a..62fcf36 100644 --- a/drivers/input/misc/pcf8574_keypad.c +++ b/drivers/input/misc/pcf8574_keypad.c @@ -131,7 +131,8 @@ static int pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_i lp->laststate = read_state(lp); - ret = request_threaded_irq(client->irq, NULL, pcf8574_kp_irq_handler, + ret = devm_request_threaded_irq(&client->dev, client->irq, + NULL, pcf8574_kp_irq_handler, IRQF_TRIGGER_LOW | IRQF_ONESHOT, DRV_NAME, lp); if (ret) { @@ -142,14 +143,12 @@ static int pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_i ret = input_register_device(idev); if (ret) { dev_err(&client->dev, "input_register_device() failed\n"); - goto fail_free_irq; + goto fail_free_device; } i2c_set_clientdata(client, lp); return 0; - fail_free_irq: - free_irq(client->irq, lp); fail_free_device: input_free_device(idev); fail_allocate: