From patchwork Tue May 23 15:13:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 98051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2230090vqo; Tue, 23 May 2023 08:32:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Uz3F1/F1Lfl1y1Qd6/c1YgY2C+2uc5m9onNbZxZkqXpVFr32Pi1uUYsHtwLx7eVe+wFv7 X-Received: by 2002:a05:6a20:4287:b0:10c:96f0:5f63 with SMTP id o7-20020a056a20428700b0010c96f05f63mr2137726pzj.28.1684855945119; Tue, 23 May 2023 08:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684855945; cv=none; d=google.com; s=arc-20160816; b=mnGQSXjT+h2FzpN8tTI/H025g/cFJFK1tcO6TrQQvOegMwAl1T4nUTFib0p7kwswxs +U9QUHxeGVleFJlvhkzTyEQQdY4M5xkBkCXzmsigua8Nrg1YtQA876ey5rc2Y3QlvS0V mBcDo9zAxMQ4zkLaEU+J1MDUyMYK2B1DyUOsOAYtQVeQ7wQ94iLgj6Fm4kZxPFVifPtG NekSboPkc0YHpkqGS+Q9N/ZKBBHKQAKkgmX6maTfXFupt4PMd+7aUea6b44niLkSLPPQ BSq36lU0z0Ia2VINHgnT7r5tIdUpvxTqlYIB8pzR2Qu9VKAUVDhTdydJ+Hi+AZE/xtBU 7NmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=S82svTrvxny4aDGyP/j17iOFvjY4L9G+4A7fL4DPgoM=; b=UrX0/noyS05oSJE9G8pwHNm9kJ7rSugsfBTfWK7ev/y4c9G5mZO1/riMO+fRW6Hxk7 FYFRaKqpNMxvEnlQrSdbTvchlou29EGsO+/YiqCs57CiTWZSUBk3kOnO96WFCJpy2Rte Q12WwQps6LGODUF50U0irgmz7SnmwI0Ro44QCoCGnPZs8boPyDh8DnJuv+g/MqSkhHAg PEWn5BuuSnMA52ESAkDciCr4qibbvJfFoU2IbzU8SO7fy2JjltcCZcCgCVnAQIRA7QvN lLLfeICfEHanFszPU8yjR5bRPckrXzJ1fbrHyirbuwBf1lzEsJYmr8BZtl2WmJcYj/It Lbxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t20-20020a63b254000000b0053413a8294fsi5186588pgo.899.2023.05.23.08.32.09; Tue, 23 May 2023 08:32:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237215AbjEWPNq (ORCPT + 99 others); Tue, 23 May 2023 11:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237533AbjEWPN3 (ORCPT ); Tue, 23 May 2023 11:13:29 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 466AEE7C for ; Tue, 23 May 2023 08:13:09 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:b0ac:7afd:272:4cff]) by albert.telenet-ops.be with bizsmtp id 0FD72A0010Jkz7G06FD7NG; Tue, 23 May 2023 17:13:07 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1q1Tgy-002swX-Dr; Tue, 23 May 2023 17:13:06 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q1ThC-00CkPC-Rr; Tue, 23 May 2023 17:13:06 +0200 From: Geert Uytterhoeven To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH resend] Input: gpio-keys - convert to dev_err_probe() Date: Tue, 23 May 2023 17:13:05 +0200 Message-Id: <9fc16eea6fd2c687b69e007e792e8c6338f80e48.1684854670.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766699507229766660?= X-GMAIL-MSGID: =?utf-8?q?1766699507229766660?= Use the dev_err_probe() helper, instead of open-coding the same operation. While at it, invert the error checking logic to simplify code flow. Signed-off-by: Geert Uytterhoeven --- drivers/input/keyboard/gpio_keys.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 93b75d78a9cb882f..5e18ef01b0340f1b 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -523,18 +523,15 @@ static int gpio_keys_setup_key(struct platform_device *pdev, NULL, GPIOD_IN, desc); if (IS_ERR(bdata->gpiod)) { error = PTR_ERR(bdata->gpiod); - if (error == -ENOENT) { - /* - * GPIO is optional, we may be dealing with - * purely interrupt-driven setup. - */ - bdata->gpiod = NULL; - } else { - if (error != -EPROBE_DEFER) - dev_err(dev, "failed to get gpio: %d\n", - error); - return error; - } + if (error != -ENOENT) + return dev_err_probe(dev, error, + "failed to get gpio\n"); + + /* + * GPIO is optional, we may be dealing with + * purely interrupt-driven setup. + */ + bdata->gpiod = NULL; } } else if (gpio_is_valid(button->gpio)) { /*