From patchwork Sun Jun 25 16:27:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112640 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997506vqr; Sun, 25 Jun 2023 09:30:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ50Quo9cDfcNIN37aozV6Bkt7yeCehq4jHAyjGJkmdsBHPFtmctXLYO7a6ks4LHiJY7zKPN X-Received: by 2002:aa7:c446:0:b0:51b:e834:9265 with SMTP id n6-20020aa7c446000000b0051be8349265mr8532737edr.33.1687710654368; Sun, 25 Jun 2023 09:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710654; cv=none; d=google.com; s=arc-20160816; b=Ag+IMOgu0kAiML2g47gpPKYBeCkdTHvMvbEx8pG1kQGTnysmq5Hwk7wueOwulwR2oZ MM6NvuB3JHsrFG1W5/RiH1C1LS2rDU1D7xgdOJ4qs9++F0bJOAksmFNmK6O77xn1KrFk tvxCE8dtsP6TNmM+qe0j9LBHZM6Za+RX8S0MtWcIQD2TFxyP/AiCg3NJMUqTFr8IM2NA 2rOj9Tp6odwV4eMpbYvAyJUFUa0VYNKcO8H8RLtCuxypcpyw2czjzAT4IeD08KSf9rYU bbNaBDwVV6uSf4WS8xan8gizVxL7TLMHkEaWL3wj/Vzk2KVEJf7d/r6KJzYC36FQv7lT VSmQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=e6wgHXQvCt97a66kq5RQ8NaDVI2/Jj/XxJYdNlS5IWY=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=L+WgqT1sXdAD69oRFc1USOUyRdXNy4Dhg3N0ca7gzIz3YiPY2xWOrbCWYyNQHJ1scP CNJUzDTg+MQUendByNeJ8iAf8TP+hqupo94cBFrjcs0oHhWxVsdX7wE386TCeJVlbrG9 zUDzQpzvLUy6yqfJgEaigC1/JEbvGYnnOys+0tSe+J9tzp6JlzYeD6wWBl8hLGsinQXP G1X4RBvo/In83XaZG90w0upMh8z96aQJV0bP6KANZiDEZg+uWhKPZ6qLir+QtAuKAWq0 mGtPXBpRtXL4nrSdnJMoLnlZ4DPksuQn/kHpbGPxE7f+L08XNoXeCnaCF5FWeaTqMYHY bgvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wf5uthm3; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a7-20020a50e707000000b0051a53f2684fsi1719962edn.576.2023.06.25.09.30.30; Sun, 25 Jun 2023 09:30:54 -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; dkim=pass header.i=@linaro.org header.s=google header.b=wf5uthm3; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231255AbjFYQ26 (ORCPT + 99 others); Sun, 25 Jun 2023 12:28:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231230AbjFYQ2m (ORCPT ); Sun, 25 Jun 2023 12:28:42 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81B94E7B for ; Sun, 25 Jun 2023 09:28:35 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-987accb4349so387417366b.0 for ; Sun, 25 Jun 2023 09:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710514; x=1690302514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e6wgHXQvCt97a66kq5RQ8NaDVI2/Jj/XxJYdNlS5IWY=; b=wf5uthm31KWYncxa45wPIq2Uq+k7DyNTVrLFQslg19SdzcfP3IWLjNCXniDo6YeW61 rSZBEBrhSFTpnD7iV5bycDTvOxDFhECWzBZJscYohglnyBO3jx6JWPA0vDkf39eSNQ1w fwyQ4veWBXLWvr1ltCdoifGDsKtOLpPM13OJtqNJuHqNCtNo3tnjtjoxg6Y7R0AB+oPz lgPGKjd8+Nl/pNKJgqa0maR7BPI3QTJLO8TfXKD8DvDeDA+X21jwRktFY9COYJHFS4fI fh15zOVXM2XpCIi3fd1xVoYpbIv56yV8SAGyCkIo+hmCbV8SHby1HMYrR3XtbMzSlmX+ 6xWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710514; x=1690302514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e6wgHXQvCt97a66kq5RQ8NaDVI2/Jj/XxJYdNlS5IWY=; b=TelWO7APD/vCWt4MVViOlUSgUnc9xjYKd0Ogz1QSEfqOlnj1wq9+SRYLCLrFWjT+Te lmuD63vdhydwlscfc7d1oi5kVr30UztDZGT2mBLVjCLxOBXRyO/57bEEO917A7bKPLAY lv86eO+hdQ3fGSra0T6rn6fmm5Sph/QtG3DzSHCNitxAJyE4jleyXzjcN9ifdAsavpi/ WEJOYq2MGRb3fxMz6TD4sdhnDQNAXZUINk0xXBpIliEk+y98QwGBPaYbVMfNHzrnM3MY vcWxTXdkTovTxuyNGr7a+Z2GgguCRwrWAX1eWYtcGYpszGjUsuJu1eNFjg88GSB6eYKj GfLQ== X-Gm-Message-State: AC+VfDzOwYaTJo9w+2j9TIibKD/bf0Vy5kwWv6YTWmzURSMlwjgidsZd F5m7QTEcvi3Bobp0QHbgMpz4Zw== X-Received: by 2002:a17:907:6d97:b0:988:9621:d85d with SMTP id sb23-20020a1709076d9700b009889621d85dmr20163181ejc.46.1687710513865; Sun, 25 Jun 2023 09:28:33 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id ec10-20020a170906b6ca00b00982be08a9besm2277731ejb.172.2023.06.25.09.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:33 -0700 (PDT) From: Krzysztof Kozlowski To: Dmitry Torokhov , Hans de Goede , Linus Walleij , Bastien Nocera , Sangwon Jee , Eugen Hristev , =?utf-8?q?Mika_Penttil=C3=A4?= , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: Andi Shyti , Andy Shevchenko , Krzysztof Kozlowski , Andy Shevchenko Subject: [PATCH v4 06/24] Input: bu21013_ts - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:27:59 +0200 Message-Id: <20230625162817.100397-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230625162817.100397-1-krzysztof.kozlowski@linaro.org> References: <20230625162817.100397-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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?1769692887058354596?= X-GMAIL-MSGID: =?utf-8?q?1769692887058354596?= Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Hans de Goede Acked-by: Linus Walleij Reviewed-by: Andy Shevchenko --- Changes since v1: 1. Remove unneeded PTR_ERR_OR_ZERO, as pointed by Andy. --- drivers/input/touchscreen/bu21013_ts.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c index 85332cfaa29d..f811677a59f7 100644 --- a/drivers/input/touchscreen/bu21013_ts.c +++ b/drivers/input/touchscreen/bu21013_ts.c @@ -495,12 +495,10 @@ static int bu21013_probe(struct i2c_client *client) /* Named "CS" on the chip, DT binding is "reset" */ ts->cs_gpiod = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH); - error = PTR_ERR_OR_ZERO(ts->cs_gpiod); - if (error) { - if (error != -EPROBE_DEFER) - dev_err(&client->dev, "failed to get CS GPIO\n"); - return error; - } + if (IS_ERR(ts->cs_gpiod)) + return dev_err_probe(&client->dev, PTR_ERR(ts->cs_gpiod), + "failed to get CS GPIO\n"); + gpiod_set_consumer_name(ts->cs_gpiod, "BU21013 CS"); error = devm_add_action_or_reset(&client->dev, @@ -515,11 +513,8 @@ static int bu21013_probe(struct i2c_client *client) ts->int_gpiod = devm_gpiod_get_optional(&client->dev, "touch", GPIOD_IN); error = PTR_ERR_OR_ZERO(ts->int_gpiod); - if (error) { - if (error != -EPROBE_DEFER) - dev_err(&client->dev, "failed to get INT GPIO\n"); - return error; - } + if (error) + return dev_err_probe(&client->dev, error, "failed to get INT GPIO\n"); if (ts->int_gpiod) gpiod_set_consumer_name(ts->int_gpiod, "BU21013 INT");