From patchwork Sun Jun 25 16:27:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112655 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7001058vqr; Sun, 25 Jun 2023 09:39:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ42gUf7lesYERI0T5TZ7PXxpoet8Mv6WX5hoL5ggIJTaGuUqySZKPist+Dtg5q016IKomGx X-Received: by 2002:a17:907:1c19:b0:973:e5d9:d6ff with SMTP id nc25-20020a1709071c1900b00973e5d9d6ffmr24857444ejc.66.1687711156569; Sun, 25 Jun 2023 09:39:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687711156; cv=none; d=google.com; s=arc-20160816; b=Lw3DdxyNrwBjatNL8PINufGAJ8UHcCAb/lDgdZEa9uYAIr8Irjk9ocbdb4/t1b7mSV R6q7ea0Bq/xOphrDP5qOiYxa6b9pjp6XVrMX4weyXGNq+icgjbMnAbzHZfKUvbRCnUDY 6V8aVIHJ6EQwoO5ZFSFDhHeOsKXul2HQ58IsJywMrY2CZIDQWzMLMoS/6+0QWaSjPy+D Rgfom2bmli8SLWh7/PEEOGKi2brhbkvmDJqoIc6PTm4AKWGrGyCzMNbKuVGWJAhEP+3i AzEAITqPw0MYmVk568lvmhbpYIheZtj15ABro+KB2mHBivPrmOSeRhz2CrRDHeITFXi6 xyIQ== 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=8ZvbC3ZPt55NmPj9EWoBgNDeYcxlZ+9WZ1c1ZpUtvDs=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=uZTv8SxZchEdhEpG1OuQY2WklsYUCKqBCQzdMRf0NKUF6XJQv3QtRbmDDIlt1hYoyk Hpf1NIq8FUYC4hOoGHP8Mfh0oCHKP5BZBGqKZ2lN5+PSyH1kUWQsekNU0A15sBVMMc8A depSw6VqHcdfyXO1Rks/YyCOET3POq/9/5bkxjoHSHXSfzqifGP13VdUy82Uu2w9cCno WNCzEtNgQQPNTuBpvJJRLWaJCwj2rxz3qg7tN7SDDx38dj8WdO63iGIz9noWPv32jzCR jq+h46qJx4fYKcuS8hAhbskZt9Z23CEp76xQAtbN/v/mTS4esN4wIlmCCKEo+puO4TG1 ZasQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V3MOXov5; 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 i11-20020a170906090b00b009865b525f38si1864060ejd.79.2023.06.25.09.38.51; Sun, 25 Jun 2023 09:39:16 -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=V3MOXov5; 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 S229905AbjFYQ23 (ORCPT + 99 others); Sun, 25 Jun 2023 12:28:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229820AbjFYQ21 (ORCPT ); Sun, 25 Jun 2023 12:28:27 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCC59194 for ; Sun, 25 Jun 2023 09:28:25 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-98e1d3be004so115156066b.1 for ; Sun, 25 Jun 2023 09:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710504; x=1690302504; 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=8ZvbC3ZPt55NmPj9EWoBgNDeYcxlZ+9WZ1c1ZpUtvDs=; b=V3MOXov53g3ZDu8LrcB6yeY3mCKfLjTgv8aERjwD6ZwjRyP74+miUwM/OWlxgCKtyN y5wq3vW9LNqZVFmyctn9GDTylK7ShRLmGWcdy+i+YlPhORyLkho48YWmPhhCleBCCCOk lwwtwGBnoej1wmCBzbqv7hFR+DTmWUo3VXJUSeq1HsyCcGTx70//ycUCBodR3Pj0qrWG ym3Q1M+U8QonDF9G5KdwgsFkRYl4/qvsnZLaKo2u00CCq7gRiYZCc5Co46UzgreV43Q8 J3NwB5fTLMaoAlsrWzVbnhIYn6kQHgU6/s1zvgFnLSXw15nBxsibJAo+WA3HqzDn3IIk HTPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710504; x=1690302504; 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=8ZvbC3ZPt55NmPj9EWoBgNDeYcxlZ+9WZ1c1ZpUtvDs=; b=FTliZXt4QCjxlQjtPwmb/2t4cRgwNhkLgiSIGbjDGjmLhpyiTmCufwf7D7Vg+eal99 vYpprLkcnxfdGw6qMi35bGGQZ5j+Z6jqV2jo0CMJwjKGnP5YotG2Bo8LjFtI3N7VLzoY qcZSi19b0uaVS1x7WYRt2ee/2ksYBNtTfDc6oRHdslDx1v9lLm5MNd+6HeZ6fONn2hM0 7jqbndjUKtVr+kqrCNKf8OVvsspGP8g//HORTEzU4i7bzdksuHKvfuptGf5efICrVF9/ qJTis7LJLVyUWOfi8Yr6rKKWWKWR3o6HkjU0l8innz9VHqBQYRmuSutxQN8mPVpNnLFX f24w== X-Gm-Message-State: AC+VfDxpu7M/tdG3CVNbPQkAoOna5KBJYLfxq1GQgnct5KDgATRDESuY 0SrUrdq+4ylB7IJ5AGmO/L81Hw== X-Received: by 2002:a17:907:8688:b0:973:e349:43c8 with SMTP id qa8-20020a170907868800b00973e34943c8mr23825334ejc.69.1687710504335; Sun, 25 Jun 2023 09:28:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:23 -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 01/24] Input: gpio_keys_polled - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:27:54 +0200 Message-Id: <20230625162817.100397-2-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?1769693413833031077?= X-GMAIL-MSGID: =?utf-8?q?1769693413833031077?= 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 Reviewed-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/input/keyboard/gpio_keys_polled.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index c3937d2fc744..ba00ecfbd343 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -299,13 +299,9 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) NULL, GPIOD_IN, button->desc); if (IS_ERR(bdata->gpiod)) { - error = PTR_ERR(bdata->gpiod); - if (error != -EPROBE_DEFER) - dev_err(dev, - "failed to get gpio: %d\n", - error); fwnode_handle_put(child); - return error; + return dev_err_probe(dev, PTR_ERR(bdata->gpiod), + "failed to get gpio\n"); } } else if (gpio_is_valid(button->gpio)) { /* From patchwork Sun Jun 25 16:27:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112635 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997382vqr; Sun, 25 Jun 2023 09:30:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5QCZS/trZSz3rqko2uLb723+jJOBxN513YtZe4XJCX+/h9hE5mmhLMeu4qRpDAmQwIzQ2D X-Received: by 2002:aa7:da44:0:b0:51d:9605:28fc with SMTP id w4-20020aa7da44000000b0051d960528fcmr1042823eds.41.1687710638608; Sun, 25 Jun 2023 09:30:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710638; cv=none; d=google.com; s=arc-20160816; b=dTob5xIjIREFDcKIYhxQ5Dn6RUtOFl6SqgmV4BfuMDfEuxou/ia+h3+OPqmGJhPcA6 z2Z5ngkHgYIUX37URe7Toy0mv5GLgLfBjdr0pHrA2CJnKITAm5di6DRwRv0JnGKomowB JYyO5NBXerlG5AFp+11iOSkRfGSVLZLjNPRw8T+m43KvyfFoiwiRHCevSrHgeLp5IFh2 JwCLT/ko1ORIyUhQJIiqKldUh3xIgi1qhnbO0CvcN81BUY66AFtTr18DK7byd+kDoJsV 5P4dVRyOVYBgMdzJ75QX26B7Q1RQEXvnQ0Xlcu9I99vZg/LWLx9b0eBbFozsTomD1vMm Q9VA== 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=MhbTmWLYenjDvgCPdawCZ0z1wOdFokFdu4M42znMvBc=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=bJBg2In6YpqZU0+K8xrTkfuBB1BzSywzWR1Cp/DoHaJ9sr5+cJzNkSlEsOUDePmJxn /3zFlaHhYiaLjXDJ/Gek0TzdGodkJvD0k/lIB10p4vw0aTRfGblMrJ5K3UtkZmbORjm/ cuABXUUCNmsVaIYphswTl1sbxMQ3lPFjt4jptTF7sPRACbnpO9BWt4BEYYwGr8bzVoEX Gkoft+xiO2++FNmai24cRgdMg9IOPIDR/xCPCtEVjbxDG8oWU4VTwe6H2Zwd5P2iF/ci Qzv2n5+r3V4T+pHfujSCxV0h6q8UGC0FqXzBAEsFYhQAidduF7JSAWi6ERBpOdcu0lEw prnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fXbr+vKH; 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 x1-20020aa7dac1000000b0051bdd99a9d5si1638085eds.423.2023.06.25.09.30.14; Sun, 25 Jun 2023 09:30:38 -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=fXbr+vKH; 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 S230363AbjFYQ2d (ORCPT + 99 others); Sun, 25 Jun 2023 12:28:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229669AbjFYQ23 (ORCPT ); Sun, 25 Jun 2023 12:28:29 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC8E4BD for ; Sun, 25 Jun 2023 09:28:27 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-977e0fbd742so292513366b.2 for ; Sun, 25 Jun 2023 09:28:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710506; x=1690302506; 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=MhbTmWLYenjDvgCPdawCZ0z1wOdFokFdu4M42znMvBc=; b=fXbr+vKHwGyxL19CpBIWWE1z4qe6yNjPqhO894jstqRJwAaJit3oJEQBw72WaSe086 sKnAxkQfwIjFDs56AcB3QEbJA/Tz2wAq207MUz3AhBpoxtL/ShkS5buWVYxEvgpCcLBj zohiRxGNtl6t5cB/sR3u+wNm9xgfkoqH8cwx+6aD+qwNkSQp5UMzaHp8nNR1/DlqwyES as0nzyTcnULNZ2vksaBwf8P26F29m9UCkfJ5iDHULHc2p/XqO/14j7n+HZS24Ia897Rv 9i9eUFpppp61bD1uVX9YLfyo3IInvthxasCvyEIOP+1PB4Jh5Sk8WlUvWdLbneoyLfV+ VRTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710506; x=1690302506; 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=MhbTmWLYenjDvgCPdawCZ0z1wOdFokFdu4M42znMvBc=; b=ktt4yLJ4vqxZY4fAf0/dfIjZ/RWxFOxV2QHYLtzStxJeZgHY0jj4ZXpgMDrySK7/VZ KlxDipq2MK+uHbI6OXoWMBtezZE+UBzOMJuEB65OvR5TrKFHc735AO7ABKkNqk3tBPnT OCh61lActsKVVAJZCM/LUy7jSJyRXtrwhrxF9qJZyqaa/ymp0M9zr9N74QVT8Jeho5DE kkzhiYJH7QCfCN7OergRggK1TLRCZNmpIE4Z8EXV40yD8OoP6K8vXzBQ4Xdu2z/C+K8j OcOkYztxfbr/UkUaZKnQOuzPRydL7RdXr4dAqKpS+BDldl8IdS7XTqQIlR4OMHlyYU8B jABA== X-Gm-Message-State: AC+VfDx/K8GAjXJ4WYvbZvI9qvlMbIkqk5Z6Cu0hfJIoo8HRXq6VT2WE r3bMBQ+PdtEsKwIkZ9W+aIGAng== X-Received: by 2002:a17:906:4fc5:b0:96f:d556:b926 with SMTP id i5-20020a1709064fc500b0096fd556b926mr21570923ejw.77.1687710506301; Sun, 25 Jun 2023 09:28:26 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:25 -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 02/24] Input: gpio-vibra - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:27:55 +0200 Message-Id: <20230625162817.100397-3-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=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?1769692870928983298?= X-GMAIL-MSGID: =?utf-8?q?1769692870928983298?= 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 Reviewed-by: Andy Shevchenko Reviewed-by: Linus Walleij --- Changes since v1: 1. Remove unneeded PTR_ERR_OR_ZERO, as pointed by Andy. --- drivers/input/misc/gpio-vibra.c | 20 ++++++-------------- drivers/input/misc/pwm-beeper.c | 19 +++++-------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/drivers/input/misc/gpio-vibra.c b/drivers/input/misc/gpio-vibra.c index 134a1309ba92..c1c3ba5960dd 100644 --- a/drivers/input/misc/gpio-vibra.c +++ b/drivers/input/misc/gpio-vibra.c @@ -113,22 +113,14 @@ static int gpio_vibrator_probe(struct platform_device *pdev) return -ENOMEM; vibrator->vcc = devm_regulator_get(&pdev->dev, "vcc"); - err = PTR_ERR_OR_ZERO(vibrator->vcc); - if (err) { - if (err != -EPROBE_DEFER) - dev_err(&pdev->dev, "Failed to request regulator: %d\n", - err); - return err; - } + if (IS_ERR(vibrator->vcc)) + return dev_err_probe(&pdev->dev, PTR_ERR(vibrator->vcc), + "Failed to request regulator\n"); vibrator->gpio = devm_gpiod_get(&pdev->dev, "enable", GPIOD_OUT_LOW); - err = PTR_ERR_OR_ZERO(vibrator->gpio); - if (err) { - if (err != -EPROBE_DEFER) - dev_err(&pdev->dev, "Failed to request main gpio: %d\n", - err); - return err; - } + if (IS_ERR(vibrator->gpio)) + return dev_err_probe(&pdev->dev, PTR_ERR(vibrator->gpio), + "Failed to request main gpio\n"); INIT_WORK(&vibrator->play_work, gpio_vibrator_play_work); diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c index 3cf1812384e6..1e731d8397c6 100644 --- a/drivers/input/misc/pwm-beeper.c +++ b/drivers/input/misc/pwm-beeper.c @@ -132,13 +132,8 @@ static int pwm_beeper_probe(struct platform_device *pdev) return -ENOMEM; beeper->pwm = devm_pwm_get(dev, NULL); - if (IS_ERR(beeper->pwm)) { - error = PTR_ERR(beeper->pwm); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to request PWM device: %d\n", - error); - return error; - } + if (IS_ERR(beeper->pwm)) + return dev_err_probe(dev, PTR_ERR(beeper->pwm), "Failed to request PWM device\n"); /* Sync up PWM state and ensure it is off. */ pwm_init_state(beeper->pwm, &state); @@ -151,13 +146,9 @@ static int pwm_beeper_probe(struct platform_device *pdev) } beeper->amplifier = devm_regulator_get(dev, "amp"); - if (IS_ERR(beeper->amplifier)) { - error = PTR_ERR(beeper->amplifier); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'amp' regulator: %d\n", - error); - return error; - } + if (IS_ERR(beeper->amplifier)) + return dev_err_probe(dev, PTR_ERR(beeper->amplifier), + "Failed to get 'amp' regulator\n"); INIT_WORK(&beeper->work, pwm_beeper_work); From patchwork Sun Jun 25 16:27:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997391vqr; Sun, 25 Jun 2023 09:30:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5QUple7r2IUh1XlAvrobFz0XKssMBFZCiRbDwpmDFxSvJA9BUXRkkgfFPGOVyLel+4j8oh X-Received: by 2002:a17:907:9623:b0:988:9a65:eae6 with SMTP id gb35-20020a170907962300b009889a65eae6mr17876139ejc.38.1687710639312; Sun, 25 Jun 2023 09:30:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710639; cv=none; d=google.com; s=arc-20160816; b=U1nxvRrd6Gx6WytLai56sBCyxgHiDBjtfRnM8uQ3uOq3NciNifCnVb+QhISS+JzjKc nBzxcT8ZpCAZt9oa0yvuL95RbNeorwJHlwXLLih9LrB3nJ9/y4PhG2WMQMZkFqV0KGTB OehbjvBIiUS7Yq9pZwGvlAd3vsB2pAUgyqZMicoKuW82vBNGCedYkQVfJBGjMVT4/7rP x/F6be4YXq288zfFKD2vmuzniIxQ/oA3+wGgLrP+LFpDq6xUQo9j4TYIzZQ6W5uz+5hS uY5nCChHilm3au447oAsVStnoRZR2dCbAhvMY8sPDuRqRseIXvNQ15SJlF0ZjrHk9ksn jOzw== 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=5RFM7q0XUB/BPBex5dV6DFuQg1MifJuVODWi1OqzZMI=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=MOp21+BYcSO+3skeyNtYnfSFtJiGCfBGdgp8cp2MHDPd3UQFcQY7QfeHRgEBLLUjiF F132gS0ScWnjUhKKcqF91WSUDdReqcj9NRCoSXuBg53tbmojQr+U/0MOpA3+5086U/Iw gBK45l+KmwBbFwzLQvTUHylyy/6Q+NZYvDtOLcQ/Je7GWMOGfm7q2ZftaSKsMr8W4lC3 nLb4Vkc9dnakzo9RFka5lZcHnQauCuxd7T7ln8b07o0ZNyWuxtMjI0h/J9OlSAblXA4v EYoosTzc3b0A+HSdthlM6fcCBYwalvnazPBrXW3c2kLXG0ZRNxHWqmnFjcYfOKGWKYuQ gwYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nhEOiQn2; 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 qx27-20020a170906fcdb00b0098ed8b2adf1si519240ejb.530.2023.06.25.09.30.14; Sun, 25 Jun 2023 09:30:39 -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=nhEOiQn2; 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 S230506AbjFYQ2g (ORCPT + 99 others); Sun, 25 Jun 2023 12:28:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230307AbjFYQ2b (ORCPT ); Sun, 25 Jun 2023 12:28:31 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C33319A for ; Sun, 25 Jun 2023 09:28:30 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-98e011f45ffso88978066b.3 for ; Sun, 25 Jun 2023 09:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710508; x=1690302508; 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=5RFM7q0XUB/BPBex5dV6DFuQg1MifJuVODWi1OqzZMI=; b=nhEOiQn20PfGaXL3/ExuEYiZ5HhwbowCQ8DuAbnO38IEqytDerd0mBUBIhC8vLJ4xD 4FmI7zaJFbIe3UhWB5oQ1phAfwybavGrzsdx2IqNshnHScdkcF6KvsG5oZQFsjac86jQ J84haSDvvLvGrqs2BaKLXt9IUWEaiGP2HtXu5d3BfOFxv1yZ5529Qa+Fnl3CkzfbUGB6 mA5jK67V7fuNVYTfuE9qzDDHjswvbNqF9+sNs/S0addld1mtd4tKa8FQME5mXxp2VMSa 9IX+qCtyW07vnz/WmjR0rzvkGJhBoip8op02F/XziRguPwhkJ/Q8K5kTBXOy3MwiY3Wi GdDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710508; x=1690302508; 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=5RFM7q0XUB/BPBex5dV6DFuQg1MifJuVODWi1OqzZMI=; b=Ze01ApiLw4MZS1G28GnBWOAGrKC7cBYJxQkv/Q0rfpq68njbF3nBYpnXkG5Y4oZhJW sN8NUhGxIlVXuAU2koX82Cl+CNHWTtLeYG/KqPGeVC92ZO4N8Zek1Sti43wnXl8oTXl9 RfDo3ScQlfbcgHYAen8RgG9xIHbK63SkEQymZDO7JgMjd2aZ/C39RowHlCE7stRPGUcv OnMSyT1g0hB+qs4GExVQXZoIwGTaWM7fkfIWBt/kluKw0Xh1/cXuQJIwVxOEJCiv9dZk aLaYhmwHuUtFbLtcEJ3XXjuRDIC3ISM+GcrwAagEOszgv9od1k326ovH1tt5Z0PZYWI0 eOsQ== X-Gm-Message-State: AC+VfDzPYdZ2NLQkEpgRlQ0mmLGP19eiO1I2Vz7IBgfRReHhwyf5GRbo kFeKGBsy6zcHE4SG3QeGQYNkQg== X-Received: by 2002:a17:906:9b8b:b0:98c:ef87:17ea with SMTP id dd11-20020a1709069b8b00b0098cef8717eamr9115555ejc.13.1687710508473; Sun, 25 Jun 2023 09:28:28 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:27 -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 03/24] Input: pwm-vibra - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:27:56 +0200 Message-Id: <20230625162817.100397-4-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=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?1769692871352733509?= X-GMAIL-MSGID: =?utf-8?q?1769692871352733509?= 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 Reviewed-by: Andy Shevchenko --- Changes since v3: 1. Rebase, adjust to new driver changes. Changes since v1: 1. Remove unneeded PTR_ERR_OR_ZERO, as pointed by Andy. --- drivers/input/misc/pwm-vibra.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c index 2ba035299db8..a3cde30ee8d2 100644 --- a/drivers/input/misc/pwm-vibra.c +++ b/drivers/input/misc/pwm-vibra.c @@ -140,32 +140,20 @@ static int pwm_vibrator_probe(struct platform_device *pdev) return -ENOMEM; vibrator->vcc = devm_regulator_get(&pdev->dev, "vcc"); - err = PTR_ERR_OR_ZERO(vibrator->vcc); - if (err) { - if (err != -EPROBE_DEFER) - dev_err(&pdev->dev, "Failed to request regulator: %d\n", - err); - return err; - } + if (IS_ERR(vibrator->vcc)) + return dev_err_probe(&pdev->dev, PTR_ERR(vibrator->vcc), + "Failed to request regulator\n"); vibrator->enable_gpio = devm_gpiod_get_optional(&pdev->dev, "enable", GPIOD_OUT_LOW); - err = PTR_ERR_OR_ZERO(vibrator->enable_gpio); - if (err) { - if (err != -EPROBE_DEFER) - dev_err(&pdev->dev, "Failed to request enable gpio: %d\n", - err); - return err; - } + if (IS_ERR(vibrator->enable_gpio)) + return dev_err_probe(&pdev->dev, PTR_ERR(vibrator->enable_gpio), + "Failed to request enable gpio\n"); vibrator->pwm = devm_pwm_get(&pdev->dev, "enable"); - err = PTR_ERR_OR_ZERO(vibrator->pwm); - if (err) { - if (err != -EPROBE_DEFER) - dev_err(&pdev->dev, "Failed to request main pwm: %d\n", - err); - return err; - } + if (IS_ERR(vibrator->pwm)) + return dev_err_probe(&pdev->dev, PTR_ERR(vibrator->pwm), + "Failed to request main pwm\n"); INIT_WORK(&vibrator->play_work, pwm_vibrator_play_work); From patchwork Sun Jun 25 16:27:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997492vqr; Sun, 25 Jun 2023 09:30:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ62s7pWmxkLVvC9y+pNC64Pbi78HBk/j/uIv7+MxAeHiYmoEawD8L3dU/9nc6f+T3FZokfk X-Received: by 2002:a17:907:702:b0:982:be38:a5df with SMTP id xb2-20020a170907070200b00982be38a5dfmr22626821ejb.63.1687710653355; Sun, 25 Jun 2023 09:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710653; cv=none; d=google.com; s=arc-20160816; b=TbW5/OG9gwW4es3p69J88ro5JN6DE02P9DF8KYxK5dST1pVYCpbdrJ8VYqX4VpFWjC paE5e2QTioWkOGi6qGS/H6yCOoDhroX2bfGJno5xHJrqX8QoqyEGn81SpbVkw1ra6B6t 2zbbiJTRoMLSInigMqHEeEwexFLGpujKPkr/RIGnG/R2LTIW8PKnaLS+H1vpzdY1jJAH yMPTkd0tCV8Yk7SjEv8x7fyKsbbWMyZERCK73eUr0CS1RXbAk0L3FTInu5OlkYJjRUyU 6ywLOb1gbrkWLgYXZpaHy9xf+pDyZQYnlF2duMc53sqxQW4WI7UdmNE9mUt+CO+ofiig CD1A== 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=PQQKSSUy+f0J5aGwdtUfDXCIC6e04ohCti7qa0/jnj4=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=bYyOCPGrwl5rBtuYMHQ0b4YqcqzGXOZd0c16y44g8j3v8kCtv89zLWKjeB2p3b2MWI gL1vxz7PuQsJqAypmTeks3L8L/wYWjj3h9Px5XjPOFRDtRvfXvfaPXmHhB8ct24sqPzI Bu08fZXIb2b+XxoZyP0Zzk7uXfnc9cRcZ95rt9MTBXlXaVcQc73L8ujuuTKY3RkTInQS ezmyZ5Uyt8YFBrYb8OfxhUE1YllI6okGVCR4Ha9uDBdvA6f6HDlY8yC5OKg2BAavPpw4 NYAEt5A1bbZinEr/ktQQWsvYG3GDOEx+zaHS2g15t37nJetS0xRBw4rBnCAZBVS8Iiy1 RDMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WqrjXLMk; 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 ay14-20020a056402202e00b0051d91303c5fsi1090464edb.677.2023.06.25.09.30.29; Sun, 25 Jun 2023 09:30:53 -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=WqrjXLMk; 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 S231295AbjFYQ2o (ORCPT + 99 others); Sun, 25 Jun 2023 12:28:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230491AbjFYQ2e (ORCPT ); Sun, 25 Jun 2023 12:28:34 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 037361A5 for ; Sun, 25 Jun 2023 09:28:32 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-98377c5d53eso293551466b.0 for ; Sun, 25 Jun 2023 09:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710510; x=1690302510; 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=PQQKSSUy+f0J5aGwdtUfDXCIC6e04ohCti7qa0/jnj4=; b=WqrjXLMk8MjPhCqBb7u4L85CzjKQP0v6bdDMWRRvVx4A4YiLvtd3udbtnWs5Kf2W1E syLob4whf20gprUtgDIS7uLzTwIl8Mc1jXaZoNti8nruVXk1U3wJLBTzZ2fanPbkAZ/1 Uk/Df7kmPyc9gHwT0lcAWG/3GhnpMx8jqY4xaZDymdb/SOeCE/Q+pNTGn5CHaS392JLR xdWHcLbxeKJU3k4JdEuitQG576I8ycIx4LaIOhor9ggDtCV+oDoIigt/P8WAV/eyTv1Y j+pc2XZy6BEQbPhvjlqL/7Ry1vMOnlfA66OiA19iQTr3S/y917LO3kn7y9VnvUzEoKJ1 VvZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710510; x=1690302510; 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=PQQKSSUy+f0J5aGwdtUfDXCIC6e04ohCti7qa0/jnj4=; b=TEDiCK62zv5euJA3aAXjgbZE/Vgberr82QeatJyyPAeL8EPyujXdGNAM6LmNaDI2A5 EDRfBxM2rACNYJ40kWdknGhFfq0OluuJBhz0VTHFquVOeuBpmbSbK3OQS20uaF9yQ259 Sz8oWgmfIEbOV+3Q2ZuaZ8sc6f3qLs9QuGGYb7JhsBMLMfRXH4xb2zr43sPZZboTV+iQ FxIFuGtzi2glN5HHICg6spgTKnwTqriZOp40mjFzB62Pb99jPyP2h1i/LzwNtLnVUW72 r3aT6NfaccCkhOBcBAl2J/KkFuP0XmBvIIBBs8sdWKJFiloZS3UzsZtcyRU6y4BhsTkq 0A9A== X-Gm-Message-State: AC+VfDzhtviw1CMAiHefBTGSpeAV2XJO0jK0GLzYmPUVrAV+cCYoyTr2 a1pa1l6OjXG0PsMIYQSmpY5vhg== X-Received: by 2002:a17:907:ea9:b0:98e:2c13:c44d with SMTP id ho41-20020a1709070ea900b0098e2c13c44dmr2466192ejc.68.1687710510279; Sun, 25 Jun 2023 09:28:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:29 -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 04/24] Input: rotary_encoder - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:27:57 +0200 Message-Id: <20230625162817.100397-5-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?1769692886031829751?= X-GMAIL-MSGID: =?utf-8?q?1769692886031829751?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/misc/rotary_encoder.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c index 22ec62083065..fb3a34f8eccd 100644 --- a/drivers/input/misc/rotary_encoder.c +++ b/drivers/input/misc/rotary_encoder.c @@ -236,12 +236,8 @@ static int rotary_encoder_probe(struct platform_device *pdev) device_property_read_bool(dev, "rotary-encoder,relative-axis"); encoder->gpios = devm_gpiod_get_array(dev, NULL, GPIOD_IN); - if (IS_ERR(encoder->gpios)) { - err = PTR_ERR(encoder->gpios); - if (err != -EPROBE_DEFER) - dev_err(dev, "unable to get gpios: %d\n", err); - return err; - } + if (IS_ERR(encoder->gpios)) + return dev_err_probe(dev, PTR_ERR(encoder->gpios), "unable to get gpios\n"); if (encoder->gpios->ndescs < 2) { dev_err(dev, "not enough gpios found\n"); return -EINVAL; From patchwork Sun Jun 25 16:27:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997497vqr; Sun, 25 Jun 2023 09:30:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Ql60ShoUJ0V5vancwWfRp7KtzNLBDYUWwR8p5h3ogSRuc/S/PQaGfBHopwOgsJxJHxS5S X-Received: by 2002:a05:6402:34e:b0:51d:9b46:c638 with SMTP id r14-20020a056402034e00b0051d9b46c638mr98387edw.2.1687710653698; Sun, 25 Jun 2023 09:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710653; cv=none; d=google.com; s=arc-20160816; b=og07YYI68jeohJr6cFtS+YmgIqa8gqspwrDbPXol7h+ZJcoJyQlqUqsijOxlds9OK3 puRiRXbSQzjedj2JYPs82NxhrTlPtnqUZnsqSHxAvM3Tha3e6YNkSxA0CAOUiHxNm1rf D8OWyk1maRVQPJQMAxkqMwmUJbJiaoQujE1g/Lfr0Z12hMpIyyeX/hhwuj1qqEMojiTr IQ1BbUr6D+d6T/Mk5o5qrBRpylwygfXfxjJ4yrFG1XI+kC5AR3UCHjcvQq60VuvKtJb2 Rnz+uKiwUxKF4HbrmPNu01pNDQ1ECWyIXq1ZZ3KOel8iIsm68urtIBz6nWKqHUWxUtVg TNZQ== 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=qPKeL7lVmp8Soof/ln2U31l7XizNuOwP3sGcJXVZD0k=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=WXBZ7Alt76MRGEL4c7lPPaPItoLDDVCnjgpDlhJTvrBqkztLyq6UGuqzIAo26qpeYG Trbw9IA29JFMmPCiE7O6i9ZYdgwc1il9ETHnEtIdjhp9+LScabLkO9QBzhK79dVOesud 8IUjiQiBSfqhjqGGYmQhav63oXqb3BaFTCXWOtm5N7dEeidBSquOjGTXsyIQAaxzh2sJ Bxho4l0F94gzfwuOOzW3ESXIznJaeWlyaZYmG4lHGUjKK9Hv4Ie/G6L+sxJoFnyPyfy0 eYi10k0u7eJI+fZimE0jNE37i6tuedO/Dbo8wEJn3YHalQnINEHoiU8TRQfTnqz49oIS Szrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B4fRDAui; 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 a12-20020aa7d90c000000b0051d95d83358si630007edr.402.2023.06.25.09.30.29; Sun, 25 Jun 2023 09:30:53 -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=B4fRDAui; 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 S231374AbjFYQ2u (ORCPT + 99 others); Sun, 25 Jun 2023 12:28:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231168AbjFYQ2j (ORCPT ); Sun, 25 Jun 2023 12:28:39 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C91EBE4A for ; Sun, 25 Jun 2023 09:28:33 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-514ab6cb529so6355744a12.1 for ; Sun, 25 Jun 2023 09:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710512; x=1690302512; 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=qPKeL7lVmp8Soof/ln2U31l7XizNuOwP3sGcJXVZD0k=; b=B4fRDAuiQqILSWHSlozP4YL2+XYH3g5ulDM5J47jCaz0Ivv60eFwmhqjMOwaZGbd96 hxd8LFPjBvQMkmBgkDV0H/EjhoECy8yOEUD21Ai3k/8sJf7qMQSCWeJjQM9+0VDJh0uR xPRZh8ehs+Y/n4aAwmqvUdkMCLvCIQKVdxhhb8UIBmRL42m0bnBEQJumd8AqR2fw8WD7 G9NpD3WoX8o9cV2YgJs6NYk2ISOBthE+Cz+lJtzb5H6vgfqFizakQsDQHTigtHCk8IIn x4CK0zCnqmFkDsre7g2VwcX7NN/0e3o3OqXjjJQ7YZi63l8J4CM0lgVvuxZegvhtcLTJ L19Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710512; x=1690302512; 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=qPKeL7lVmp8Soof/ln2U31l7XizNuOwP3sGcJXVZD0k=; b=ZDkJphz1J8tT1bS+C+7/Y2hw/8moYwaiQsEQKX+nhRiugYdVMcwdCkBgJBscUenE49 vp75EFv3DKBoNT1zsXNzcRZBQjRVPOCwMwHC//kl3SuFVIlavWW/oBodg6wh6e2T1y9E hCrqdL3jWZCVRH9zgvkT9bckrBREE8QHOUrnqmTADhapy7sFht6NfDrXMDlt5+XTzsCt hI3CVX8olduP7BJ+KhLCR24v3ORbrM+cMUsCOJ8cWoOseiMx/R4QRxyfG3kGu1dCWvOh drVZ7xbq4vrszxpxjUg1zTOO/tlnt9gl3CkIO3nvFxBk+lUN6W1sIAbzqCjIGOztjFxw 6Dzg== X-Gm-Message-State: AC+VfDzGIa9sL7fy2nS9fNexqRmir2YdsBt00H41xIq+nQYT7tcFtT0h 5/doQNSEKrBHNg2oEEnHdXBM4g== X-Received: by 2002:a17:907:7ba5:b0:982:4b35:c0b6 with SMTP id ne37-20020a1709077ba500b009824b35c0b6mr25993200ejc.1.1687710511965; Sun, 25 Jun 2023 09:28:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:31 -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 05/24] Input: elan_i2c - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:27:58 +0200 Message-Id: <20230625162817.100397-6-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?1769692886577143601?= X-GMAIL-MSGID: =?utf-8?q?1769692886577143601?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/mouse/elan_i2c_core.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 0cff742302a9..148a601396f9 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1221,13 +1221,8 @@ static int elan_probe(struct i2c_client *client) mutex_init(&data->sysfs_mutex); data->vcc = devm_regulator_get(dev, "vcc"); - if (IS_ERR(data->vcc)) { - error = PTR_ERR(data->vcc); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'vcc' regulator: %d\n", - error); - return error; - } + if (IS_ERR(data->vcc)) + return dev_err_probe(dev, PTR_ERR(data->vcc), "Failed to get 'vcc' regulator\n"); error = regulator_enable(data->vcc); if (error) { 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"); From patchwork Sun Jun 25 16:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997495vqr; Sun, 25 Jun 2023 09:30:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ZAYndc5kXCCiQsHSvUCVrYKmJXRsawsMo+6gU6L+GFUXb86DlNNeGVD0nQAZMWZpMu39U X-Received: by 2002:a17:907:26c8:b0:94e:afa6:299f with SMTP id bp8-20020a17090726c800b0094eafa6299fmr24457603ejc.22.1687710653669; Sun, 25 Jun 2023 09:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710653; cv=none; d=google.com; s=arc-20160816; b=kg1DguSZ+bF8M7/NXxTyAAV4ZuHghSnuerQDqrAdPbkIzljOenJliPDXU7G9Ye6M/d 9wrH7uNHZHO1ut0fgrSMqg4IEtwX/a20sFFcsHgvIxvsY3ZgfzWPwPzeiAfB13+ozjBM 6eorCl9BASYzNGrLCWWwnGLE2B+CNaNvkteRM42XJplEFDfkjUBvNNZdWq3uO8t+En0T 4Hy3/ntSl2EitUpdNI+i7yAqjWcytc9NbK9Z+Fs/s9T12WEqq1vOd0kKxVcN7DDYOXed g3gO4KQ+LmX1Jzv9dAtYHC+q2PxNlk49Ph8xMLUHl067pxc7k/BVIK7ZNnVhAWfS/cNS 0MMQ== 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=obNX6hJ41R1Oqa+mhu5/W/1j/nEz8J6V9vPhPBspkGg=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=DHiu8cjFy9kSMb9gfqNRKUHq2zYHTs9dTIZLpOH+NqbX8wWts3+oWvdXh4uxGcn2o0 Gi2T6jxCRo5oduYK79G1skTJn1lURkw+aUYn0LCdcYFLH7VzsLlW2/ng8t1Pdz13JD7u 88ghmuoJ4OdwQzAxBghFQ1AGyiuyxc+CaXUq5Pe80WHZBlbeUHJlxfp+nsFSgbVndaBf Bq8/b/tfE27O593X0SnWBpMBCpurBcAIQUuq9y3Kb7mFEtinhoydElFxBkuVW8sZ3oHe OP36rwq0LuJdLiZ2E+RWZz58aqFi0z1M9OFKJML0uREY1NzUb4VHfaqXnNVj12zwZeyT D8gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ewt+VV2f; 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 w22-20020a17090633d600b00983f3f76dd0si1797530eja.155.2023.06.25.09.30.29; Sun, 25 Jun 2023 09:30:53 -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=Ewt+VV2f; 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 S231154AbjFYQ3C (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231173AbjFYQ2o (ORCPT ); Sun, 25 Jun 2023 12:28:44 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB27410DB for ; Sun, 25 Jun 2023 09:28:37 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-987341238aeso290060566b.3 for ; Sun, 25 Jun 2023 09:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710516; x=1690302516; 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=obNX6hJ41R1Oqa+mhu5/W/1j/nEz8J6V9vPhPBspkGg=; b=Ewt+VV2fIDbO03/ieoVJr0rxByU+q4lMkrvlPb1o1TzzLnTlQLY6nLA4F9SU5XUVDj VVqS5buRf4NFjaNz+co7Q729ikUX3gQwVn7mMCIYmfhtR5sxqOGnKwFzivMeLCGyUBAA AbH3AkQvL2EJFauv9N1+Cidzb7ijHsQ6jsHo3sCLIXXiFXsmy85hDlb5kKzCAcLRNsEG DixQjoUtRNXGF0izuc+OoP9Ipl6+w1Ic177T7I9KGbSimUsyqovk3KRkgPqdfC2Tsv7a LPNdMx6w3Loxss0lrHgD0q/qYwdjuU2Qr+u74ImAmU/MksWS1LB1BVI8I9c8qYI4sO7u Y7jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710516; x=1690302516; 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=obNX6hJ41R1Oqa+mhu5/W/1j/nEz8J6V9vPhPBspkGg=; b=NnoOZDbHJEMay4tDGuFnzKTeCHqfmUeRNk8EYzUZZDyYLyyK+1KnUBPeofhjHK2LyO bN0n2ozPj55w3yr0JAzlDRV1KQfSs8RiVJPfVKHYMPqdBUK8GSMG/lY6JrQ9MYkt+LW2 2IsZGTBzKJZDi4lWwWEVQqAeVlfcebLaYTZTfr0I2kJ2IpFYCFQjByPjdlUgMiZfVMFS rsYx7obQBWyWZ9BgC5al9UGcmOCrVe0M6h0007RIz4Q3LIS94vYaywQMQnOEs8eGOo1g rC8qBBnV7aa1vzCmN8oQxrhPk9HtzNdaxUUESt/yAOe/zviKPktCkxqPc+QhL7YuYjmJ xtcA== X-Gm-Message-State: AC+VfDxydh7sWU/T6PFurd0d4/vBVb1gT2gt++0zXf1gxhwV3EZb6mnB QgxTxRVWRNCZoFTbZpAvcwdsjQ== X-Received: by 2002:a17:907:c25:b0:988:aa45:827 with SMTP id ga37-20020a1709070c2500b00988aa450827mr18607461ejc.11.1687710515796; Sun, 25 Jun 2023 09:28:35 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:35 -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 07/24] Input: bu21029_ts - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:00 +0200 Message-Id: <20230625162817.100397-8-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?1769692886231828080?= X-GMAIL-MSGID: =?utf-8?q?1769692886231828080?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/bu21029_ts.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/input/touchscreen/bu21029_ts.c b/drivers/input/touchscreen/bu21029_ts.c index c8126d2efe95..3d81ebe66b66 100644 --- a/drivers/input/touchscreen/bu21029_ts.c +++ b/drivers/input/touchscreen/bu21029_ts.c @@ -359,23 +359,15 @@ static int bu21029_probe(struct i2c_client *client) } bu21029->vdd = devm_regulator_get(&client->dev, "vdd"); - if (IS_ERR(bu21029->vdd)) { - error = PTR_ERR(bu21029->vdd); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "failed to acquire 'vdd' supply: %d\n", error); - return error; - } + if (IS_ERR(bu21029->vdd)) + return dev_err_probe(&client->dev, PTR_ERR(bu21029->vdd), + "failed to acquire 'vdd' supply\n"); bu21029->reset_gpios = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(bu21029->reset_gpios)) { - error = PTR_ERR(bu21029->reset_gpios); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "failed to acquire 'reset' gpio: %d\n", error); - return error; - } + if (IS_ERR(bu21029->reset_gpios)) + return dev_err_probe(&client->dev, PTR_ERR(bu21029->reset_gpios), + "failed to acquire 'reset' gpio\n"); in_dev = devm_input_allocate_device(&client->dev); if (!in_dev) { From patchwork Sun Jun 25 16:28:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112641 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997535vqr; Sun, 25 Jun 2023 09:30:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mHbVvP6qF8DtJOIdzqoiLoy+SH9Y/HMyqH57bUKTS37KYNY6tObFC6MYL/zypwq9gIKx5 X-Received: by 2002:a17:907:272a:b0:98d:6e25:aa5e with SMTP id d10-20020a170907272a00b0098d6e25aa5emr6668275ejl.31.1687710657930; Sun, 25 Jun 2023 09:30:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710657; cv=none; d=google.com; s=arc-20160816; b=iNuPK6vSoWl43F8+MvZbClOGV9arjHWQRMx4OMyKoDnMF9z1RuAV4w2vvHEr0PUaZ5 pFZimceDggk8TIVtd/bgQltD5EreV+keMOkuEr9O2h6toxFnQRHkb2EvhKO+AgQ9qAG6 TS7qLBjuV5YTF/qukbW9QfHXA3UG0pQIuFu/I97Xthjf1fwO5OMCsNhKCLG00kKWPmpk AwMx2MGDAvLsg+2WfVQgklVCt9OjA1I2IMxoQMR9Mfb2iVboFApDYCQc7ZSaQ5NMJHbp EpC8RpCw7U5VONNBog8qH2I86PziuyiB8qt2Ipw5qEu62WJ9JEHb0/uD4Tp26AwixQgs 0rUQ== 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=sNSURL3k6Qay5bYk2FFSYR3PPWS59SfGVXg9PpOHVeA=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=HLqzSU+rsbxWOh5901lCZBBj+WtLLH75ayxLLgvQqo+UH33wgyNyT7khk0dfinyvCR uMEwEK+8nXfeKwFSOUXGsT62b9z2LCiMyBYJhnEbxjarBYU+C2fbKfWU5yAjacH/y0Oy rroUzRoH0G6iFYN/bP1XltWup6ljgHbBb6Nseuyvn0xQ1IQZ7T6Helzo3YzR44uSTdzJ wu1UC1UKyYw/v+Ru+qH8/NWhyuLje5WBOD6mt7e32PiKl+qNfTTza/kC3qFtjmpxOefC H0ZLjUXKPDUeJDytnagvCaopqE7r281migat3xNyQLj56UwjYtvwFDdYpDu5i1ElKbEN wJYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AxBkfFnS; 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 gr1-20020a170906e2c100b00974d5816686si1901444ejb.66.2023.06.25.09.30.33; Sun, 25 Jun 2023 09:30:57 -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=AxBkfFnS; 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 S231502AbjFYQ3G (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231199AbjFYQ2t (ORCPT ); Sun, 25 Jun 2023 12:28:49 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BAD9BD for ; Sun, 25 Jun 2023 09:28:39 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-98e25fa6f5bso160104766b.3 for ; Sun, 25 Jun 2023 09:28:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710517; x=1690302517; 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=sNSURL3k6Qay5bYk2FFSYR3PPWS59SfGVXg9PpOHVeA=; b=AxBkfFnSYMeyDyifssvOcSpvlHZk/yg55Z26BVi9K72MFLzpaCXoujbiTwBfdjxD7l NwbDaAVbb3yecQ0+2am8/x2+MoSlMSi7sdvA1NXXAImIeFia6yJMnK0XF9M87RXMMShs uS6w256K389mkMZUuaxfhPEzd1tGrRJjlvUwBCC/jPgNIB+AGC04hU17X2XqS0IAybjr RQfOEz7Ip6zcf1vCF4sJwPMtsMTdpfAswuF3h/2P0cCHOCeVOcsV1xvN0IR96sPa+i7e +Df1gBmmmatCAmK1Hsfx/kwck9xTku4oENk2YanlIM+kCucMLFXUSGqLmkojmc3s3353 pdyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710517; x=1690302517; 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=sNSURL3k6Qay5bYk2FFSYR3PPWS59SfGVXg9PpOHVeA=; b=YDDSlzCXHjB2isXtXVPTdURD4Tj1Fb/5fb7yDziJtKr8OBnva9mKy3O41M6xLielcp eEE5nCTc8QHXcTF3Q7XRbIGfTPfAEukwrZ7ni4GsEhUUMYOU9SWZ/QEJGT6EV/k2vcvK R9peOGc6UC6n2efda+VoBMQkVv5S2AoczcD4xbaXCCaMhqI8wnvMGYZPhZk6Wdtf6JU1 xCk7HcGjfrNGoklCI+nxvfKCfGJkXYzJKrHH7n1rRwyi3FxcZ96JcAw3I4olrarkxS4X QuJUuytV0b6ZFKqYhLE+Qy8t2boQLore2Y2EzxL2OTYP2gqfGcb4+0nAWeizfOW+sKKm Przw== X-Gm-Message-State: AC+VfDygiVegAyt4DN9h2zRMHGMw1jXOmOdStHzDKbH3i8xqKLMxDhK7 oxqSuVguc0hxSomFHDLdpAgAZg== X-Received: by 2002:a17:907:8a1a:b0:98e:419b:4cbc with SMTP id sc26-20020a1709078a1a00b0098e419b4cbcmr2616998ejc.12.1687710517664; Sun, 25 Jun 2023 09:28:37 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:37 -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 08/24] Input: chipone_icn8318 - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:01 +0200 Message-Id: <20230625162817.100397-9-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?1769692890497967025?= X-GMAIL-MSGID: =?utf-8?q?1769692890497967025?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/chipone_icn8318.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/chipone_icn8318.c b/drivers/input/touchscreen/chipone_icn8318.c index 9fbeaf17f00b..d6876d10b252 100644 --- a/drivers/input/touchscreen/chipone_icn8318.c +++ b/drivers/input/touchscreen/chipone_icn8318.c @@ -191,12 +191,8 @@ static int icn8318_probe(struct i2c_client *client) return -ENOMEM; data->wake_gpio = devm_gpiod_get(dev, "wake", GPIOD_OUT_LOW); - if (IS_ERR(data->wake_gpio)) { - error = PTR_ERR(data->wake_gpio); - if (error != -EPROBE_DEFER) - dev_err(dev, "Error getting wake gpio: %d\n", error); - return error; - } + if (IS_ERR(data->wake_gpio)) + return dev_err_probe(dev, PTR_ERR(data->wake_gpio), "Error getting wake gpio\n"); input = devm_input_allocate_device(dev); if (!input) From patchwork Sun Jun 25 16:28:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997556vqr; Sun, 25 Jun 2023 09:31:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5LZ/zvjo3eZ0MVX9jYAmJ/vZ8gDKUX+2BXXZ6O7wxNm9CJbUktFdOJKlUP8rAqO8mSRy0f X-Received: by 2002:a17:906:3084:b0:98d:696a:531c with SMTP id 4-20020a170906308400b0098d696a531cmr6260146ejv.40.1687710660605; Sun, 25 Jun 2023 09:31:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710660; cv=none; d=google.com; s=arc-20160816; b=qA09X4UUoSJyLAda3eDvAuBtFp2Ch8CCqh1B6d2r/QjZhMSlcNUIH9K+iGPVXi3UQo 2VJnSTbHEajhWO1dWE4FVm5TOh2OGT630kTKY9Cey6LiSBe6a6NVONHM31y4JIeVaIAI /wApu+jAy0cHe6E18RrOFjfxXWuPK5CDJsQgW0c1w2yFpfT+BjJ2hVK/mG0rAcyQcQGM JilKH3EOeCWPML52Ri3KJENa2C2MJcBYuU1Q7S8tFBA28GuYC0fJI0DSxoTEngy/EDuE sl+/nzjO6szrpU35kNuqnDqATQBolg/QoE6BieBVfce1XOtx7rjR9B38IZmeNJR0AyPg /L+g== 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=PO1VEj8PCt+SP2FLdSp8jHVPdvdkdeiUc+/c+qgri9c=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=NuojvZxkmWbvjkoOTeGk9WgqHVCWxBaRjCsG/5/NAk7rbp+WB2t314pumslzdMjUMR w6S8m7D1JNlWNSuRk6RFNpw+eB230ExBSoGHD3gsMt1StuYCTHJnz1/irlxG3oaDLqq7 cSHIeFsFci6+9VNDZXt9OxpxbEpxqOM4eOnZMDC6AHuv7ui2ivSOP9mio/JiAs7hqUJY DXdD68ESmgnRngWl6jHlwrxe5FmerEgLWIFXaBXL5BKF/KM98yEMx12kEA33m7VyRmBK qgaDzVQrSxSiyYFlHKYXDfvxvAkvNNfXXV3DeUKAlvhYUX8uOjfIH6YUuK62nFwTbOzc tQBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wTzGEi82; 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 uz14-20020a170907118e00b00970f0c11efcsi1855815ejb.339.2023.06.25.09.30.36; Sun, 25 Jun 2023 09:31:00 -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=wTzGEi82; 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 S231397AbjFYQ3P (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231247AbjFYQ26 (ORCPT ); Sun, 25 Jun 2023 12:28:58 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83D9A1723 for ; Sun, 25 Jun 2023 09:28:41 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-98934f000a5so290909166b.2 for ; Sun, 25 Jun 2023 09:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710519; x=1690302519; 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=PO1VEj8PCt+SP2FLdSp8jHVPdvdkdeiUc+/c+qgri9c=; b=wTzGEi828CVHhBinoiCuumo6mbuHwRBUt3VOGODKfCCVqZB0A4RejQPQFvJ/ypE65T dqsBOXIt9ozbLcZKz07P/ptiWeAr0yJGJ6Ggpghs2ef7Ccx6Y7V6TJpBkO0KqblTi0Tz gz2Lw3N1pDR8HW+tfohVXT3mMvs378/2sqbD7CYcMPALwctsmXgwRqhBUuQxcFXRL7nO /AJeFDR9ifwca54oC3MtU+y82lq4v5S6o7vjDqL2RnZkB0/nb42InuxsD06gE4ltJoCH yqNkKgNWKhl0PBnFCupHRzwpqIohIOPtZW7dcN2Uk9GVxx/smiuqjm3cengh/2ilY9Sp a7YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710519; x=1690302519; 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=PO1VEj8PCt+SP2FLdSp8jHVPdvdkdeiUc+/c+qgri9c=; b=VhNxpWO0/vQHuix+UuX+uzFhr9ExSbHGQA9T3RIQsR0th1wqLSgcBH5xTC3voJ915J 9m1Ho4l4NefihujyF/F8DnxQbnhMNm5ciM3PE0gp2c7mwmVfw/8R+mHbhLTPBa/6v/pn qga+35roH33QGIWoQNVvGZZDa65pBh5uJZCC5TzP7U9DYkPtmivW5rP6aCsfWhXTM62s TjXsMordFa7jpmoQGZwOjyBSR7PpsYANRcba3UTF4zoC9X50P63hsTsT2QjBAP2p4vI+ pEcaUSnfXmagwWPID9NJqVU6BSX4w6ej0BPHeAopzEvuwP82foZHZn73/CzPOsjkt5xl fXhw== X-Gm-Message-State: AC+VfDySQs/3JnzdOj/MWpvvkYfDzEN/1h9pfFF5/Qcb+lbeDMtCqcV5 TmbsyXXqQqsFnWxEYinxe8lLZQ== X-Received: by 2002:a17:907:5c2:b0:974:55a2:cb0b with SMTP id wg2-20020a17090705c200b0097455a2cb0bmr23869630ejb.55.1687710519450; Sun, 25 Jun 2023 09:28:39 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:39 -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 09/24] Input: cy8ctma140 - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:02 +0200 Message-Id: <20230625162817.100397-10-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?1769692893233594137?= X-GMAIL-MSGID: =?utf-8?q?1769692893233594137?= 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 Reviewed-by: Andy Shevchenko Acked-by: Linus Walleij --- drivers/input/touchscreen/cy8ctma140.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/cy8ctma140.c b/drivers/input/touchscreen/cy8ctma140.c index 967ecde23e83..ea3895167b82 100644 --- a/drivers/input/touchscreen/cy8ctma140.c +++ b/drivers/input/touchscreen/cy8ctma140.c @@ -258,12 +258,8 @@ static int cy8ctma140_probe(struct i2c_client *client) ts->regulators[1].supply = "vdd"; error = devm_regulator_bulk_get(dev, ARRAY_SIZE(ts->regulators), ts->regulators); - if (error) { - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to get regulators %d\n", - error); - return error; - } + if (error) + return dev_err_probe(dev, error, "Failed to get regulators\n"); error = cy8ctma140_power_up(ts); if (error) From patchwork Sun Jun 25 16:28:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7001843vqr; Sun, 25 Jun 2023 09:41:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ72XMvUi9ftKFEhzXD9Zyu0Nl49nzEUrEaWpw5k001Z8ITGU6jXAlunlvyTz0p50aAKN9XQ X-Received: by 2002:a17:907:3f87:b0:965:6075:d100 with SMTP id hr7-20020a1709073f8700b009656075d100mr24982361ejc.39.1687711281306; Sun, 25 Jun 2023 09:41:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687711281; cv=none; d=google.com; s=arc-20160816; b=BTSqVQ0FMDPzqatn/zVl9hiKDW6QTozQ1pI2Fh+6R76Hr8zvOd0I3iTyp/gyMpUqbk iSZMIAiK9mwDR8XSutIYCzAereZ4N+g9BIiTaS8gN8IZ2WxEekrUC7Ag/RfEzssJxdRl PfoXaWpF/IKUeZLqkPy6shxz5T325r5rORPm4vRpLATqCaJKeQMuLM6dO9f6ah6UhOoX 5aojMB4r97Cu1/xGcZbdfkzOLT5c2eJSR90R8tdpcnuTRqVwBTl6YX9W0d407i9G55nP mSbVxHn+tXmgvHYa3uAL73IVNo1TFEjGtTygb4293xdNEEbA+r3fBERazNDZ3aeGdR3o pCtw== 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=o5+luIM4oVY6m4zwxYa0g/reTrWlxSPcpRwy11iCAXI=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=G9V3MnBNhrlkJhUxtpqPRbMySfhpN4jP1z8icf9N6F9ZBUP3Wq/aiHonB9tD1yyMO4 JWZeMZkRdr3OcDKib0j6l9IcpomXu53endXC/nLAZiH9pYPcm0qFN2FbKu6swkNIBPED AOzwGOjCI1gmkYZvDw1UdqhjthlM7Rex88xc+xz0j2BrL2P4fPwHtTmgsrE2dbs2e4bI 5hxL0sF/MsPUpezNDwxKod/vYQVabICVWW0GwaBZWpcKg4HkKdA/2QE7tLJGu0jODsC7 M/C+RFoJRch8IWZQ4MYD3eaFJbFEpJOZak0atHhUXkvdyrHnBTsbChjSMMhJfBYbLAn8 nhKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IQ2yWkgT; 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 k22-20020aa7d8d6000000b0051d8a648b68si1286916eds.404.2023.06.25.09.40.57; Sun, 25 Jun 2023 09:41:21 -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=IQ2yWkgT; 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 S230203AbjFYQ3X (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230362AbjFYQ3B (ORCPT ); Sun, 25 Jun 2023 12:29:01 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A714E54 for ; Sun, 25 Jun 2023 09:28:43 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-98e25fa6f5bso160110966b.3 for ; Sun, 25 Jun 2023 09:28:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710521; x=1690302521; 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=o5+luIM4oVY6m4zwxYa0g/reTrWlxSPcpRwy11iCAXI=; b=IQ2yWkgTiwDkHCY0+Tqkm2zbfLKoJml0PgbbWrjnchB8GS1SAX3Y+H7ulDlOPz1B3N EPQ8m31vpqjV0EHG0hR3oPHA0c0EspOE5kT8TLcObZc2EkDq0kqH+hoSluV4YbjSo5aE PKxB0TTagHMQk5X8R1qRINRPA3BdHBZls693D3yFg28xyBDHYBTrL5hlz7uONvZ1Pkuz pZFNQ20pJAtACzMnczzwIQ4JCxoNb7fg2JDQMcq6zaDyI9dafAigsTedjlD2wMaaY9Qr ntBr6Qq9E+b9mWdS+I/13PNrkrh80t2CayU27HjI3NgzW6BFt4eX5KOU9UzROrBJlDNo qpeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710521; x=1690302521; 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=o5+luIM4oVY6m4zwxYa0g/reTrWlxSPcpRwy11iCAXI=; b=HakT0CQelLShtb+fOQF0WhYLPZtBy7nV68yhTqxH9BipeqY8tpZACsh+hzLK3nFAES oL/3kLqTqyujlTlQPBAoCBDKVI6RVwyS5FxvlbvnMiq13PrZVVR4GntyjHzko+ty6ZJ4 EZH+HfuRVVVw3LsOInTH+5mmsjkxhl1qTxnZ+WFY68FczDW/zGxP9wwTDFJmoi1q+Otd O7NFmwYPEgDjibBftIU3gFWCLnymeuT7GmEHl/VDVLhUmZfGS+lboEhOXmMvxxDspyGq X34lXplf3zVMrtZyiL7N3/z6Z5N1Kh6sWfaektDiiXcsrOSHiHrFQ3vCiyDxh3bHQsmM GmRw== X-Gm-Message-State: AC+VfDyfpN472z6GHJGjRTy6ufSmR5KTWlV5nbJBJQNlYQIASWGUL0ur PaRqfpJqPruq5MloO4fSoZwwLQ== X-Received: by 2002:a17:907:847:b0:977:d53e:4055 with SMTP id ww7-20020a170907084700b00977d53e4055mr23345868ejb.58.1687710521262; Sun, 25 Jun 2023 09:28:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:40 -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 10/24] Input: edf-ft5x06 - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:03 +0200 Message-Id: <20230625162817.100397-11-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?1769693544690633156?= X-GMAIL-MSGID: =?utf-8?q?1769693544690633156?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/edt-ft5x06.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index 795c7dad22bf..457d53337fbb 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -1168,13 +1168,9 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client) tsdata->max_support_points = chip_data->max_support_points; tsdata->vcc = devm_regulator_get(&client->dev, "vcc"); - if (IS_ERR(tsdata->vcc)) { - error = PTR_ERR(tsdata->vcc); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "failed to request regulator: %d\n", error); - return error; - } + if (IS_ERR(tsdata->vcc)) + return dev_err_probe(&client->dev, PTR_ERR(tsdata->vcc), + "failed to request regulator\n"); tsdata->iovcc = devm_regulator_get(&client->dev, "iovcc"); if (IS_ERR(tsdata->iovcc)) { From patchwork Sun Jun 25 16:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112662 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7003997vqr; Sun, 25 Jun 2023 09:47:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6DGWr/G25LtWy8I6yiihir336TEIvN8SwfdDyy/+FgiCO6LQF50GPABOMyBOz0etzXdqSr X-Received: by 2002:a05:6402:4c9:b0:51a:327d:f065 with SMTP id n9-20020a05640204c900b0051a327df065mr18573793edw.13.1687711658288; Sun, 25 Jun 2023 09:47:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687711658; cv=none; d=google.com; s=arc-20160816; b=Pop0ONV2RDtv7YabbLkIYVbDMYSlleLbIyzk5xkW3P0uRR4+8reQWGLsKVbZDUkZ9/ Jc6FJQaGqqxavk3AglEsNkftakHHNwO1KFZvfiTafy19j9Vr5vGnSYvxOVs8Lo9EGlqn U6ivHCxuMx8sLj1/TgMgSA+nSMmZGVBhP4LdoMO224WHDeD6arcFqR9ey6U2Luz4ZI5D jknb7d1htk8doWA0BygjK4Z5xz6bopmxwyJAmZxjs9Q39QRI7kt0xVUXFyBbhKQvxT0a 1J1y/nZnjaY85ttwkS2QEVdXgYFIoy9v2wGH3E+AguNmMXwNdgsNojFTEYBNDaXAh3cP YXTA== 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=OZfZ872GVOCcTPRjs89Uw4yCp3UorSm6QgpAUx4XVGY=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=cBlqsSP+8MMsm3r41ur+xsWNAVppbhanaAUzpODYfxKscGzUzrCv2/TY2T+hsd+Hqc I5Uzb8s/tIKAuabWs9k6uGYUZKuRPfCXmAJfMS0YabM20+b59Ehg21pmAXwBqIX0oWdh EYEuxKe/nqrEugjQHEKMnefGnt7mtPv9bjPqinQPqDjbgtkNb47w4XjBSGp/go4ZYmkp +4ghcbYe0BZMhoOUR18YAeglgufnpb0+x4dqhYX6GGf/50ZVKToqdbSqA26ndPc1YsAs ybUjwxhBTKKp0GDgmv9wjnTNXCLUkTLd6f1Ao3O5K7z7s3+KSn6LeL/pISIdpIuHqq/3 TB+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uo1zyOlL; 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 k16-20020aa7d8d0000000b00514b2a9ce5csi1707958eds.11.2023.06.25.09.47.14; Sun, 25 Jun 2023 09:47:38 -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=Uo1zyOlL; 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 S229846AbjFYQ3l (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231476AbjFYQ32 (ORCPT ); Sun, 25 Jun 2023 12:29:28 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91D4310D3 for ; Sun, 25 Jun 2023 09:29:02 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9786fc23505so193117966b.2 for ; Sun, 25 Jun 2023 09:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710523; x=1690302523; 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=OZfZ872GVOCcTPRjs89Uw4yCp3UorSm6QgpAUx4XVGY=; b=Uo1zyOlLpZL2UBUHHUOOzVncIJZUYyWyf+KewkL3fWr5uxxQ0uOaPw4Xv2hQwniSfc pgH2LSxOxvUXpNiE8EZ34eAw9p6xaJzvDkxghta3xsyyfzw2ezFfsCzELzjJiVXLIMwg d7TfoQp25dFYj7lLljcgxRHLH1gHGo4QytWJxa/4yRpHrVr6EoaVN8QYEHiL7yaznWYO jrMX6E9H5A7yRNPA0l2KKsaZgxBbATBGQlD2PNw60hFBp52zFrC5mdDGCZ7ECH1uxXd+ 8KSTb4Vlko3rV/Y7yE2emHAjZRLQoxLfyUaBQi2oK3y+zUmWbaIqvKGL8CV8IfL27L2m teZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710523; x=1690302523; 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=OZfZ872GVOCcTPRjs89Uw4yCp3UorSm6QgpAUx4XVGY=; b=gmUl3GqJQ0p2oQF9TIw3+g6kM6/T2bEV0c5ML72B6USjX7XpNgKsIh0zfuiKomm1pb 2qeWl0IKJ26WXAIwWH5OI0Gf0WpJ0rhZUuMxHXKLgcj29apMqdJbYOZQuKBzRH57/F0J 2rKXOCvGKgRUMo53CVWvSRPjOqRDywna/c39636B45zgkoGqogS2MNUyknX5CZjoLgbq FMmqcPtTw+btBrc7NC/UiTLLcWNfAdnc1zEjZndKdO+OuVKGfzax+gzIoqNJDlWY445v ZKNArlfavTx6wOdQkyQalIX+/qCRPVKmFKnqfeMWCM06Fyp5PUZlUwk3VXgg7P2AipMg 1GIQ== X-Gm-Message-State: AC+VfDwaxYIVmEiyNtIVBlVlzMncUhRAh3ia4NMUBw2tLFAqwTMSPe2x CY5T5tP7MEz3KgLvNL3xGVCvVQ== X-Received: by 2002:a17:907:3189:b0:974:2169:5f81 with SMTP id xe9-20020a170907318900b0097421695f81mr23050480ejb.22.1687710523442; Sun, 25 Jun 2023 09:28:43 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:43 -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 11/24] Input: ektf2127 - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:04 +0200 Message-Id: <20230625162817.100397-12-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?1769693939679480752?= X-GMAIL-MSGID: =?utf-8?q?1769693939679480752?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/ektf2127.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/ektf2127.c b/drivers/input/touchscreen/ektf2127.c index fd8724a3c19f..cc3103b9cbfb 100644 --- a/drivers/input/touchscreen/ektf2127.c +++ b/drivers/input/touchscreen/ektf2127.c @@ -264,12 +264,8 @@ static int ektf2127_probe(struct i2c_client *client) /* This requests the gpio *and* turns on the touchscreen controller */ ts->power_gpios = devm_gpiod_get(dev, "power", GPIOD_OUT_HIGH); - if (IS_ERR(ts->power_gpios)) { - error = PTR_ERR(ts->power_gpios); - if (error != -EPROBE_DEFER) - dev_err(dev, "Error getting power gpio: %d\n", error); - return error; - } + if (IS_ERR(ts->power_gpios)) + return dev_err_probe(dev, PTR_ERR(ts->power_gpios), "Error getting power gpio\n"); input = devm_input_allocate_device(dev); if (!input) From patchwork Sun Jun 25 16:28:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7000079vqr; Sun, 25 Jun 2023 09:36:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5gek4eq0uz6dqHiJxFPIR5WjurGzoyYDGMITkIn6ygTeYUDZeuiENYYztqLkcKV2cFZ4of X-Received: by 2002:a05:6402:29a:b0:514:945c:6cea with SMTP id l26-20020a056402029a00b00514945c6ceamr17083137edv.37.1687710988629; Sun, 25 Jun 2023 09:36:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710988; cv=none; d=google.com; s=arc-20160816; b=qHr7rhvzZLAHw8DBKfX7erp18lYONsFQc/kWvBSuhtQknN4A6HorjIDa8RIySWMBOy GSTyYvle9IdwFdTeQ0qQh1f72DT/OwyULTYfW6+8kApJHzhr9sMz94rlm7dZkWY393hF 21/7pLs+f58utH9mj6dZ4l5O5J6i+L6g38IKZjMjDuiBWeHV+nc7bRmbhIBhclERaJhT TQcq2wLfYYwcXda38iAOCqiCFHa7LFRu0OMJcd7ickZdNdvsqKb9Y0kpCEriBrql1HIL hwZC2RzKGAi13cyMWCuyU0RZKlHF4TGzSIYSfWWkcL2GZa4vTeidfHQEkgW5TpqYMJax hLvg== 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=KzSyUKtYyWcpo8YKWJv/vNvepz8ollsnHyhkAh7gPHg=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=ybCuGWDBTzbZJ/ryV7e3GpWt0xl0s0pLRCoAjaTaHYWc9un0xdTjk5ZurerdTDyIP4 lUWoq4L+CdpA+mviomc5V4jpc2N/ee63T87aiyqH/SF/O2J5O2zBK0VkJ69ieUuDNkdR 6JWpu+cmXCyc9XqfOjXemv7+kpV9DH5L4VMWGEgibjKHUcJjTovA/uviZe1CKhfUgDjF UyEmy1CRLA+2goWBsgyHb/fyZTiaFHEWAVxxrlzYrfiJlbFqEal4dMrLILMn6kqDx0bE nImZuTchd9Egsjy8V7KnlQ/lGIuycQjkpKt9oaD7ckMmySKu7Wa3EoAb5yO7E7Jquyy3 +SXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JcqMy2kS; 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 l11-20020aa7c3cb000000b0051d90d25bc0si1102486edr.336.2023.06.25.09.36.04; Sun, 25 Jun 2023 09:36:28 -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=JcqMy2kS; 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 S231516AbjFYQ3p (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231214AbjFYQ3e (ORCPT ); Sun, 25 Jun 2023 12:29:34 -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 3093710F1 for ; Sun, 25 Jun 2023 09:29:07 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-9883123260fso228432966b.0 for ; Sun, 25 Jun 2023 09:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710525; x=1690302525; 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=KzSyUKtYyWcpo8YKWJv/vNvepz8ollsnHyhkAh7gPHg=; b=JcqMy2kSYIyY/DThcab8dQmXLodcWcjWpLJXwvFcL8S0oi8YhTpOUjqeckcAm6DuY+ FRICGlVWoJU7pDRDW970IopS3J4rj0DF7j/2UkuMOkvfaA+3uKZWHh2YCdYGrzJawOeT bH/4si1voF6ZhIWfBinc/eKnnVsaGFmKoAGORLYDQZcY8iuvH+e2fppbYXoDapwEnzM1 ha5LNW4h5FrYxPj0TiUnzP6qyEZ+6S+9QQXofLwjPe96nFNP/ygjhuh1Fg1w2osskjgG V+iPyz1jv1fMSn4DV+Vitp3442MzHxFUeq/HVOX4htuXiVB3z/PN/guvY+g9krSqEqwQ B/Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710525; x=1690302525; 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=KzSyUKtYyWcpo8YKWJv/vNvepz8ollsnHyhkAh7gPHg=; b=AYer0vuy+VzyRomw2ZCxobUTvJZGAs4MAsd4dgbqpvHI4D54FfUtbG2dCpDHtNv40Z xZSQgsgedyZoSERJwe8zEttsjefG4TTo9VYYaiU0HhYBh311NYYkYhywQNbCRQ1Ej5Eh yJb2I/gTM135Yrrq2y3YIh+7j1r261m5+QU1hyQkrwtsoPS+yNyk+SuzO1bc5GhflFyu G+2k5OmhRBXbgXrCxnX6F09o3Op5zhtc4bGfrsomin7YTa+gl1DhnDU+t2tfJQrSbq2K SsGXfwO9xTyy2gJMNsYEqppvoRdjMTtycIYEVdyYq23EocQ1CXCBJlIGa0JWUjaub1nw FXaQ== X-Gm-Message-State: AC+VfDz6yZ4rhGjcB6TOyM2Ju1z0fZNwstQaHup3UxQ4wxCRek/h2RZQ vrEuTGiSJo8WlqDYj9rXYZ0Ifg== X-Received: by 2002:a17:907:3fa0:b0:98c:d62e:e865 with SMTP id hr32-20020a1709073fa000b0098cd62ee865mr9726783ejc.52.1687710525215; Sun, 25 Jun 2023 09:28:45 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:44 -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 12/24] Input: elants_i2c - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:05 +0200 Message-Id: <20230625162817.100397-13-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?1769693237567624926?= X-GMAIL-MSGID: =?utf-8?q?1769693237567624926?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/elants_i2c.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index 2da1db64126d..a1af3de9f310 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -1438,24 +1438,14 @@ static int elants_i2c_probe(struct i2c_client *client) i2c_set_clientdata(client, ts); ts->vcc33 = devm_regulator_get(&client->dev, "vcc33"); - if (IS_ERR(ts->vcc33)) { - error = PTR_ERR(ts->vcc33); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "Failed to get 'vcc33' regulator: %d\n", - error); - return error; - } + if (IS_ERR(ts->vcc33)) + return dev_err_probe(&client->dev, PTR_ERR(ts->vcc33), + "Failed to get 'vcc33' regulator\n"); ts->vccio = devm_regulator_get(&client->dev, "vccio"); - if (IS_ERR(ts->vccio)) { - error = PTR_ERR(ts->vccio); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "Failed to get 'vccio' regulator: %d\n", - error); - return error; - } + if (IS_ERR(ts->vccio)) + return dev_err_probe(&client->dev, PTR_ERR(ts->vccio), + "Failed to get 'vccio' regulator\n"); ts->reset_gpio = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(ts->reset_gpio)) { From patchwork Sun Jun 25 16:28:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7004377vqr; Sun, 25 Jun 2023 09:48:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XvcyrtwX+wzKxAekF/gDODy7KYtqyD9lg+Bau/vzUeiRnYYjmUzPV9kqWW9GasoYh2zIi X-Received: by 2002:a17:906:6a07:b0:989:ca:a0a2 with SMTP id qw7-20020a1709066a0700b0098900caa0a2mr17002892ejc.69.1687711722523; Sun, 25 Jun 2023 09:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687711722; cv=none; d=google.com; s=arc-20160816; b=DKuUELccHeGx4IvtNmAS4e43fy/fnZrJQvKkeqeldnx4ucPWODH25Vu45I3JemIf5U oabgihVtC8+yQgzZdd6pC7jd4ZGmoF7xvqxkboTNgaiJa2By++pmkCd4N2yyWX4jMQ0t U6rT4Ep2BeMtdONWULqwYv4eJFvehXcsjdQNBoebxyRL8Lrz3C24fyI3WGxkFvou0/wh w0Uea+Lrgt+hPWtC3vtUtTw/lzbg3VeJfVEEx1abccG9aClska7Zk0WwRd4INrARGlOo SvwW/DpGvIwFI0o9z5g7ZtUhE9ODg0HINlotMqB28M6WoEMLET5ZHC/Iv5RA2B7tsolV Sijg== 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=S/rzC2uY92Y7QjHEbrLYHKQpIVmtiRBB2yJYhOpPt9Y=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=zirs9KWsd84tM9EFc8kmn7hXayCA60Tz1X//KZYXX7JIEnULDkubVtpzREGUP7v6dL zRcg+ONDV6Ge/dErjsDUqlAVreyCdvW3X/gJTy28tdZSuSOCYD/AFWW9fxP1hievbMxo ddM9KYD+eSAqRCWd0TGFTqvxhm80amYx6p+FsPadiadqNusbp1viv/nFhisizyHFjPFX 33xXwRLv+vVk6KarZrixvs+upqqtSJ4vtzQuq/MduwaE+vvCnYm9KNSLaZHRKf5bczBG ZUN4IeHvFwOve80vvnMt/34qzhJX60LOZbuons7ECJdEc92h7rFLQvFuB/Z5AaAIV2JV jb7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kWNVgHVX; 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 t19-20020a170906065300b00988768b4775si2098068ejb.197.2023.06.25.09.48.18; Sun, 25 Jun 2023 09:48:42 -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=kWNVgHVX; 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 S229917AbjFYQ3r (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231389AbjFYQ3e (ORCPT ); Sun, 25 Jun 2023 12:29:34 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02362269F for ; Sun, 25 Jun 2023 09:29:09 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-51d9124e1baso1476980a12.2 for ; Sun, 25 Jun 2023 09:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710527; x=1690302527; 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=S/rzC2uY92Y7QjHEbrLYHKQpIVmtiRBB2yJYhOpPt9Y=; b=kWNVgHVXaDznJi3aUv40cg0WDHjPqeQbE7ooAhNpc2QVWxrle12iAqj9L+h1TWwXDk dtkI3ow6FX5XwNM2MAed6C8itsSEWMtYnbIJocwNd873waZ/vDuEnPIfCTdcgUwZM7Cl O+qvTaWV3lFRymsHglHnxKJhxBytkBk83943nXaapTsWi20aON/w+L1Wl0hcPzvfFXhD /OlecmPqtoZ9NICiamf4EhZWcMr7NqgEDXVoHqOWJu+xyh0hI2gSKxXB4uOnWywbCveZ D/XizEWkdsh50oE8aorQCbqCr6iWPg//rU0BnBlaG1jXMHaEztkDAJJylN6+CM+8AZYV /ZwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710527; x=1690302527; 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=S/rzC2uY92Y7QjHEbrLYHKQpIVmtiRBB2yJYhOpPt9Y=; b=EApmZJL/FYdnSzLJn1uSn/Q0RHZNTct3P+DnQ4HeE1rPE2kwkZZcO/eQc8AMkIPBUP +XFt0PqCAk0QtWKP4iD2I0SZ7+IUabe4h3hlfTTJDdaxG0Uassw1+7mryQtCwotHE73l Bo7wb6/RkzPFWL3uPm3PzOQaVIVYvoNhNDiAPSPTO4XFX7Qt4ncrCSeqENHdLUBWCnP+ XVnC3CNGvTeuNcNJzIavY6HeGBdhvNW2KbSNovJAwdi4TPTMPeFcp99ZkUXK7oxlMeN4 0s1jVHjLOT+CuT9HduokwD1nK1F1Gw3ugf1Bx7rk/js+GnbgJrY/o7XxxXTTuSfoovhO MCJg== X-Gm-Message-State: AC+VfDwTmZk0YfELebvk/gmzfoFFW1WSisvfjDLjhCdJKxNVGvX6i01R smuGNptU+I3JgBbujTeo3fV48g== X-Received: by 2002:a17:907:d0f:b0:94e:4489:f24d with SMTP id gn15-20020a1709070d0f00b0094e4489f24dmr26387029ejc.61.1687710526920; Sun, 25 Jun 2023 09:28:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:46 -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 13/24] Input: goodix - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:06 +0200 Message-Id: <20230625162817.100397-14-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=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?1769694007302674349?= X-GMAIL-MSGID: =?utf-8?q?1769694007302674349?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/goodix.c | 40 ++++++++---------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index f5aa240739f9..85d4249f1065 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -935,7 +935,6 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts) */ static int goodix_get_gpio_config(struct goodix_ts_data *ts) { - int error; struct device *dev; struct gpio_desc *gpiod; bool added_acpi_mappings = false; @@ -951,33 +950,20 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts) ts->gpiod_rst_flags = GPIOD_IN; ts->avdd28 = devm_regulator_get(dev, "AVDD28"); - if (IS_ERR(ts->avdd28)) { - error = PTR_ERR(ts->avdd28); - if (error != -EPROBE_DEFER) - dev_err(dev, - "Failed to get AVDD28 regulator: %d\n", error); - return error; - } + if (IS_ERR(ts->avdd28)) + return dev_err_probe(dev, PTR_ERR(ts->avdd28), "Failed to get AVDD28 regulator\n"); ts->vddio = devm_regulator_get(dev, "VDDIO"); - if (IS_ERR(ts->vddio)) { - error = PTR_ERR(ts->vddio); - if (error != -EPROBE_DEFER) - dev_err(dev, - "Failed to get VDDIO regulator: %d\n", error); - return error; - } + if (IS_ERR(ts->vddio)) + return dev_err_probe(dev, PTR_ERR(ts->vddio), "Failed to get VDDIO regulator\n"); retry_get_irq_gpio: /* Get the interrupt GPIO pin number */ gpiod = devm_gpiod_get_optional(dev, GOODIX_GPIO_INT_NAME, GPIOD_IN); - if (IS_ERR(gpiod)) { - error = PTR_ERR(gpiod); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to get %s GPIO: %d\n", - GOODIX_GPIO_INT_NAME, error); - return error; - } + if (IS_ERR(gpiod)) + return dev_err_probe(dev, PTR_ERR(gpiod), "Failed to get %s GPIO\n", + GOODIX_GPIO_INT_NAME); + if (!gpiod && has_acpi_companion(dev) && !added_acpi_mappings) { added_acpi_mappings = true; if (goodix_add_acpi_gpio_mappings(ts) == 0) @@ -988,13 +974,9 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts) /* Get the reset line GPIO pin number */ gpiod = devm_gpiod_get_optional(dev, GOODIX_GPIO_RST_NAME, ts->gpiod_rst_flags); - if (IS_ERR(gpiod)) { - error = PTR_ERR(gpiod); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to get %s GPIO: %d\n", - GOODIX_GPIO_RST_NAME, error); - return error; - } + if (IS_ERR(gpiod)) + return dev_err_probe(dev, PTR_ERR(gpiod), "Failed to get %s GPIO\n", + GOODIX_GPIO_RST_NAME); ts->gpiod_rst = gpiod; From patchwork Sun Jun 25 16:28:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997824vqr; Sun, 25 Jun 2023 09:31:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5/stt4RGlbBv0xgShkjzDed/H8CJI1r7WjdvhRUR19azt2P7aDQ+LI7/yH4t86NNcrp9+y X-Received: by 2002:a17:907:75e2:b0:98e:43ce:93fa with SMTP id jz2-20020a17090775e200b0098e43ce93famr1716449ejc.8.1687710690762; Sun, 25 Jun 2023 09:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710690; cv=none; d=google.com; s=arc-20160816; b=OsunPanIixtJS4LvO7Dz+NWMqsARwTalYR2PGSLLscAMUG89hAP7WFuNuGhDPOCymd Yw7R1FIK1DyHjPPvYyi1csv+hfwC8oE4d2yi6pOR+iWxh3imsZdMfH41MwLZar9okGoq nQKatXNoKUPu3LQmknfZtP42BqoRMWYQAOCfa4BclS+3zoeXQu4nSgDpyH21d1yPhxdF HAEnLX0w8syEks4tiW+LyUD3UcGiK1TS+3VYqrZDZsaBKbYFpJeWlYG16CBRS7aGRBVx KKV6goNEH/y1opCliMENzB+5/a25EI5TkfMKyGuuNo6lzjPt8lGTVu40gdC+5odK3+wq X+6A== 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=wzpB2JeeP/+5LJQoX+DM+hKB46MUVJk8x7crRJkVgqQ=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=Nx8MJgMuJoMJ/7b0XbNd3bUbTZLQz7DPOhS01Qdvbj5AeeRzHhMFFC0bbCprSfVR9i dE1lP6LfKQ+K7g86iloZugNeJ2twlk7KuaTPyI+HBlF5y3YypROmyjxdI2S/q44nMyoX hZtGJ7vE3j8QsHS/1KyzpRsvcL28XesrQ7FtdiEGNmlALwAanA/fgABwPlOxKq1ReAJL 49odJFF3QXsBrlxc2KZUYdTlt92atIs0CVwelJoM6IcSmMMQd9Qgs3W5tmMkt5NiUQZa gKAeNG8RxYEmlokgxqoVTXkTlCLjVJS5ySDSmda0KJ+GUeSKBXcD+TdrJ987d9jx1KCX mJJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=trHNOk0o; 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 d13-20020a50fe8d000000b0051beec1b3f3si1637769edt.500.2023.06.25.09.31.06; Sun, 25 Jun 2023 09:31:30 -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=trHNOk0o; 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 S231670AbjFYQ3v (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230307AbjFYQ3g (ORCPT ); Sun, 25 Jun 2023 12:29:36 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71F53197 for ; Sun, 25 Jun 2023 09:29:12 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-510d6b939bfso3428791a12.0 for ; Sun, 25 Jun 2023 09:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710528; x=1690302528; 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=wzpB2JeeP/+5LJQoX+DM+hKB46MUVJk8x7crRJkVgqQ=; b=trHNOk0opvYLVYmVhzWT2Po6oKItnmcPPNCDu1Fx2rMr8oCf1DH/9UCFefDEAKU+Ky AKS4L4xB1IOig9scwrJH7yctsWIPoE4nIkf6I8UrGBlOx9Iu9SN/Xw7lJBRa6K4GH/OH ai8TkQzbEqsHroNbB1V3M9DD9yNwvK3tXiw/uXgT+Ogo5sbVW6g+oCYn2c453Nqd3zVB v9ShFIjp2rqleT3Iv8/HCuNFcvPIlU11NtGmdz5Et7PSZcxIfrcLU+ftp0EO3e6T6r+N 6WSwG4pSp1v6Ve2gQL00M0XoZYf8+XE4FrWVhQJI0OHJqc+qYe8tu769sjRaZVsuSYxe Kb9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710528; x=1690302528; 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=wzpB2JeeP/+5LJQoX+DM+hKB46MUVJk8x7crRJkVgqQ=; b=duuneWUcLXxbOwaFayXFm02FxPSAfp6RjZeNVvVBZawqZoT5joUErA52plwYy8eobb YILD2KWIJPUwM7mzHuelBsaCZg8yg7vRY6TLToZtCkX9e1UH9RhwS7myIB4Isyu2TWnR GdOXX22DcFNQ57CtIq91ZMPtNU2TBtsXdC6RPKpo8ErD+oyrRHFx6LENKDQ5LwCg/HsB WevxxZrfiNosUA2ZRsouufhvphwysa2Ck8BhYudZ7CRcY6cutw0gXwIYoHC5YmuNppoK RQS6B9Mo9+jT1JhKKwKGqhs6H+mLYxdzgm8hhibCYYQmPOJenOda8oqm4LDkbwfXRNbY Ig0Q== X-Gm-Message-State: AC+VfDwJZFJkET1JusPZECB0NaNdyAnptgRhNtqoj2AgNv+wfwb/LrFm 0q3vqENCbWrSkKjjLtxbkhGJ+g== X-Received: by 2002:a17:907:7256:b0:988:56d1:10d8 with SMTP id ds22-20020a170907725600b0098856d110d8mr19292632ejc.53.1687710528697; Sun, 25 Jun 2023 09:28:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:48 -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 14/24] Input: melfas_mip4 - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:07 +0200 Message-Id: <20230625162817.100397-15-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?1769692925070365060?= X-GMAIL-MSGID: =?utf-8?q?1769692925070365060?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/melfas_mip4.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/input/touchscreen/melfas_mip4.c b/drivers/input/touchscreen/melfas_mip4.c index 32896e5085bd..2ac4483fbc25 100644 --- a/drivers/input/touchscreen/melfas_mip4.c +++ b/drivers/input/touchscreen/melfas_mip4.c @@ -1451,13 +1451,8 @@ static int mip4_probe(struct i2c_client *client) ts->gpio_ce = devm_gpiod_get_optional(&client->dev, "ce", GPIOD_OUT_LOW); - if (IS_ERR(ts->gpio_ce)) { - error = PTR_ERR(ts->gpio_ce); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "Failed to get gpio: %d\n", error); - return error; - } + if (IS_ERR(ts->gpio_ce)) + return dev_err_probe(&client->dev, PTR_ERR(ts->gpio_ce), "Failed to get gpio\n"); error = mip4_power_on(ts); if (error) From patchwork Sun Jun 25 16:28:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112644 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6997874vqr; Sun, 25 Jun 2023 09:31:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6todL2x8XuWE7ksFpUOgTe/ElYSXb9UVjxpNGKDP/zq4YgVACc3cNz8bm+sB6/Hw+gNYje X-Received: by 2002:a05:6402:1855:b0:51c:c03c:d72f with SMTP id v21-20020a056402185500b0051cc03cd72fmr3257694edy.20.1687710694463; Sun, 25 Jun 2023 09:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710694; cv=none; d=google.com; s=arc-20160816; b=JWNrfEaQd23Kx09WAdKdafWvw/uaF7szCGrH0Gs5ATkN0fj7rtr0Sr6cozqZ0rRgiB iluOL2hFXKUSq3fv8jB05Ygoqaha5HeYaHiumUHt94qTx4sPNivaMtElLt3hKdJoXwu/ Qak106irBZExd7OoQSznjJzGxZwPF9kx7IQnYTX9Q+JD31UJ132BsbT7p+fn9Q0Hp4rB vfvppRiBDhuAx5Qyu3ip13AKGa1X7Lri+AXhul+FH3SubNddSYoVS7Fogz/O16gTVCMv o+bynu/2CqhZKVqOaziYlEwKiKfbclLt9qGss/8VszKjxDXKPxbE+rTFOmDzHbQ/T7fx mX3Q== 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=HFr85Va+I3JFQ/CS1AHNqQf8ybLG0IaDbtC5ESPVDI4=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=IoKgv+oYtGFYz6PM3RL0PtodgyMkflW9+eSCN75B89rEyqCaHmemGpkdC3vKy5H8lu tdRznJPDkcfswOacaLeamEbh4D5HUUvXxncWQNK1EW6Ztoomw9ils7J+Im1kVPU19qLZ r90IdNzz0YsIbnOl+GuKmaSUu20AHNVVwYLQyqGdw5D2x2JtMPh8Sx/ATzc1Knbfxzdi nMuZW3GVA3H6QYQGfqn8890jy8OOPiMlrh1l4nIZ4zX1TOn/3tKr5bLW/X5q7Jbfn6QL 7N3xZBjanJvkhEXC/e46mfEYbUK+ry/47+alh1GYnLlgztoRD6z8n2dZ6VbBZbWiFT8e s9bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="P4/793Ff"; 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 b25-20020a056402139900b0051836749133si1689605edv.494.2023.06.25.09.31.08; Sun, 25 Jun 2023 09:31:34 -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="P4/793Ff"; 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 S231747AbjFYQ3y (ORCPT + 99 others); Sun, 25 Jun 2023 12:29:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231202AbjFYQ3i (ORCPT ); Sun, 25 Jun 2023 12:29:38 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6E8410F4 for ; Sun, 25 Jun 2023 09:29:13 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-98bcc533490so292286666b.0 for ; Sun, 25 Jun 2023 09:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710530; x=1690302530; 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=HFr85Va+I3JFQ/CS1AHNqQf8ybLG0IaDbtC5ESPVDI4=; b=P4/793FflPwuLOra9+yrjA1oii1q+mVvOCozzGq6xWF1CWxQa5aZaBBkMLzabIuC62 Yvd4/yFuCpxebdB1dgr8lR14V4yBjqIr5vrShuzX7UtrZ6Xmj6TDNHeJDvsL540s/0kh jg1bjAJJlDKifdR5vSy9w+PBoKbOBp2JmHYqnkWjUeuxy5lMtNflQkL/YHpfyMBTx6Sr /xf8EdttzMS2cRAbvHLzP3cnSiWJMPbRAEDoeBCXxOqfw9uBus9Wio2VRQxTTEMdrYES 53N507f6V0yvEqvE8EnkwGCgxv9U0V2LkZJHk1M1Kzl9vCqW1qNzKUhQ3uUJEEIM6rb6 g9kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710530; x=1690302530; 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=HFr85Va+I3JFQ/CS1AHNqQf8ybLG0IaDbtC5ESPVDI4=; b=B6mW/9LDIJXI/8RHdt2+kfK9vVqh6QrZeXBpT6nVXEsGOa4euoEHmbyZlF4pVwJIuE qfp4F0tAodAGVgXAA2XfjYoVfI0NdcZyozBxH3H0ljOqvflE81VTNv7GGMpCD+uYSB6L tNzTwLlvTYa8SZ0RGYXdgSnaowewyynaOl4f6+InyUmkAQsNEhqFWn9SCQk0CNWa6NTJ cCOTCxtJyU/IoEK4RjabSm7QmS4RaXtpRqPbsCpdn6a6/f1qXoJtv7GrPGuTUdX3/rxN caHUkyMypCRtF8JVsxpygy9a2h/nbeqENjTq7lFJjTtQALJ5ulTBAvpTyGUF6TOeOv1Y p2iQ== X-Gm-Message-State: AC+VfDxS5o+F2iVQYl56rjtPqaQL6e83xlDhKh8+Z++Pg5ruKcdd261G 1FductXs24vOqD3mC0j5SxprIw== X-Received: by 2002:a17:907:3e88:b0:97d:cdf4:719f with SMTP id hs8-20020a1709073e8800b0097dcdf4719fmr25395707ejc.68.1687710530492; Sun, 25 Jun 2023 09:28:50 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:50 -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 15/24] Input: pixcir_i2c_ts - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:08 +0200 Message-Id: <20230625162817.100397-16-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?1769692929103891034?= X-GMAIL-MSGID: =?utf-8?q?1769692929103891034?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/pixcir_i2c_ts.c | 38 +++++++---------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c index 554e179c2e48..0b4576091dac 100644 --- a/drivers/input/touchscreen/pixcir_i2c_ts.c +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c @@ -515,41 +515,27 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client) input_set_drvdata(input, tsdata); tsdata->gpio_attb = devm_gpiod_get(dev, "attb", GPIOD_IN); - if (IS_ERR(tsdata->gpio_attb)) { - error = PTR_ERR(tsdata->gpio_attb); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to request ATTB gpio: %d\n", - error); - return error; - } + if (IS_ERR(tsdata->gpio_attb)) + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_attb), + "Failed to request ATTB gpio\n"); tsdata->gpio_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(tsdata->gpio_reset)) { - error = PTR_ERR(tsdata->gpio_reset); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to request RESET gpio: %d\n", - error); - return error; - } + if (IS_ERR(tsdata->gpio_reset)) + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_reset), + "Failed to request RESET gpio\n"); tsdata->gpio_wake = devm_gpiod_get_optional(dev, "wake", GPIOD_OUT_HIGH); - if (IS_ERR(tsdata->gpio_wake)) { - error = PTR_ERR(tsdata->gpio_wake); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to get wake gpio: %d\n", error); - return error; - } + if (IS_ERR(tsdata->gpio_wake)) + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_wake), + "Failed to get wake gpio\n"); tsdata->gpio_enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_HIGH); - if (IS_ERR(tsdata->gpio_enable)) { - error = PTR_ERR(tsdata->gpio_enable); - if (error != -EPROBE_DEFER) - dev_err(dev, "Failed to get enable gpio: %d\n", error); - return error; - } + if (IS_ERR(tsdata->gpio_enable)) + return dev_err_probe(dev, PTR_ERR(tsdata->gpio_enable), + "Failed to get enable gpio\n"); if (tsdata->gpio_enable) msleep(100); From patchwork Sun Jun 25 16:28:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112645 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6998030vqr; Sun, 25 Jun 2023 09:31:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4rw9vm/zAlGUW4k445VMbdyI3i4Hyt69ASRU0dysLABEnvA8+eLnkbGbY+LiRgejrTLfZ5 X-Received: by 2002:a17:906:9bec:b0:98e:16b7:e038 with SMTP id de44-20020a1709069bec00b0098e16b7e038mr2155453ejc.23.1687710711291; Sun, 25 Jun 2023 09:31:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710711; cv=none; d=google.com; s=arc-20160816; b=twqOhS/CNMDIk95K2CWLk1Uq+6tZYBosaQV8CWzbSgcdb1y4yeIEgk4eecx4NepJ30 E1XrCIDA3D2GegoXEtWQQdgN8v5tq5zrAhQjFtlh4MLot3tdfgsPHHyYJtsZxTbVvCja PbE0fZ4RYjuny6VNnyuxTC29u42y5sv/ggjDo6k3WC3548qH2ZsY3k+Yup/i8pGw2lCw 9CseTgYUG9O0L7Pg/6PF1R0hj5sfsT1HrtV+iBjXZcA4AZwjYWoRcZJI/BTBoGUF8GYt c8KRLtjk0uMRc+2LPTYFGkD4CNHV9UgclL583PqGOs8XOiMJulsbPkbC0dyMZvGNJccF Hi0A== 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=HxreeCUsKJctxClqKw334DOez932+KTIErInSPtTaVw=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=SPkI8S4LV0zLFFuymcjNj2ss4T5fLvkHNZKAOZt5GvHFHj5nR5EDbXu7Dcmb5hOAEz 4atslnm3bKz5k31X6anBR0Lom1jNLyAeeYF3SbBQD12+81dL4VwBw3AdQ3lngW19824j I3H+xI7nMvu57lE4x2MzOo3FxhojcOdUrWxd5POPKCm9WIE0Erw6Rv1MkzEL4r3RecY3 3obCsOz+zsjhg+Tc3ifXjCDKLafR4CxGIjpBgcfIcNxl8A7/lTJC144EEhNkGEJgzy1c bOTfMtCfoPCHWsGVolEugqz49kgeuR3AAY03WT6FJjKQLhY3wpZfZbwws1/oa8CnZTu4 V1dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Pp8yU/zB"; 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 f24-20020a170906139800b0098660f88995si1814905ejc.877.2023.06.25.09.31.26; Sun, 25 Jun 2023 09:31:51 -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="Pp8yU/zB"; 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 S231210AbjFYQaF (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229670AbjFYQ3j (ORCPT ); Sun, 25 Jun 2023 12:29:39 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBCD1FB for ; Sun, 25 Jun 2023 09:29:15 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9786fc23505so193128066b.2 for ; Sun, 25 Jun 2023 09:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710532; x=1690302532; 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=HxreeCUsKJctxClqKw334DOez932+KTIErInSPtTaVw=; b=Pp8yU/zBVYnTMMwOHEiumkUJwl8bUqlFFz1uk6Dfxyx294USOCkvzgAQsJlReLPAc9 99GkJWzMhJf4GX2WkoSLyeXcFg01SnkQkcc1XU/NZCS0wO6yvUSmDuCvKJiRM2e/1PxH 1fVn/kVsNZPsEXyle6ijoWdOHPo3AAdUgTiWv/Qdlc/WsGOvNXzdpODp4SUxFjFThmb3 m5wRSZZ8LVPW5R76tvysT/4nUeracMSQ3/aR4THtDfaO+1olvVMeDOgNGBORXEthJdU5 7isF7QGeuO3ST1gp9lqFsyapaIS1UIoDIkoTCAja5ASrvQCjeUBamfYtXaLhVMdNEV3U gbjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710532; x=1690302532; 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=HxreeCUsKJctxClqKw334DOez932+KTIErInSPtTaVw=; b=AJgPjIsM7VAxKlM5dlOFODzl/e/paiHPceQgYLz+2yJGpC3bLcHuxZUjJBri9C4tAu M2V/vvyp9/xLjnOZOZa0S+si2nmufSEa/M6FxU0I+TU4A7aH9VIZJZJn6/h+AAkDQUtb cCpNq251MGDfIeetT1pkVBQ6cQ3XmAqho+YJe2cuPi6c0sDlgIcW5V+4U5ixebVQ9y8x EYuvPwBpy73EcSsm29iEChAgtpQICRcrPDd2gU0eGRYn0aQXnQnrogjmazWYHrW38PUh 0ZDyce8HfJvpJ8oERpKMKNSQX8achsjVoD957AURK/sn6sIjanfv4tacLIVCaY0aznaQ xfBw== X-Gm-Message-State: AC+VfDxdJYt6NiIx9cXykTxKiVNl99O0dYg2xLIj2GPFeoCWHs9u5GE/ +qWs2AYdv9qzWAyprTL6jfuJhA== X-Received: by 2002:a17:907:5ca:b0:97b:6c24:8d2b with SMTP id wg10-20020a17090705ca00b0097b6c248d2bmr24694857ejb.55.1687710532198; Sun, 25 Jun 2023 09:28:52 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:51 -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 16/24] Input: raydium_i2c_ts - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:09 +0200 Message-Id: <20230625162817.100397-17-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?1769692946753376730?= X-GMAIL-MSGID: =?utf-8?q?1769692946753376730?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/raydium_i2c_ts.c | 30 +++++++--------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c index 76e7d62d5870..78dd3059d585 100644 --- a/drivers/input/touchscreen/raydium_i2c_ts.c +++ b/drivers/input/touchscreen/raydium_i2c_ts.c @@ -1087,32 +1087,20 @@ static int raydium_i2c_probe(struct i2c_client *client) i2c_set_clientdata(client, ts); ts->avdd = devm_regulator_get(&client->dev, "avdd"); - if (IS_ERR(ts->avdd)) { - error = PTR_ERR(ts->avdd); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "Failed to get 'avdd' regulator: %d\n", error); - return error; - } + if (IS_ERR(ts->avdd)) + return dev_err_probe(&client->dev, PTR_ERR(ts->avdd), + "Failed to get 'avdd' regulator\n"); ts->vccio = devm_regulator_get(&client->dev, "vccio"); - if (IS_ERR(ts->vccio)) { - error = PTR_ERR(ts->vccio); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "Failed to get 'vccio' regulator: %d\n", error); - return error; - } + if (IS_ERR(ts->vccio)) + return dev_err_probe(&client->dev, PTR_ERR(ts->vccio), + "Failed to get 'vccio' regulator\n"); ts->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(ts->reset_gpio)) { - error = PTR_ERR(ts->reset_gpio); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "failed to get reset gpio: %d\n", error); - return error; - } + if (IS_ERR(ts->reset_gpio)) + return dev_err_probe(&client->dev, PTR_ERR(ts->reset_gpio), + "Failed to get reset gpio\n"); error = raydium_i2c_power_on(ts); if (error) From patchwork Sun Jun 25 16:28:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7003725vqr; Sun, 25 Jun 2023 09:46:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Yztzrwp6XLGuN0phkPkXogQPdC9mkbKjRtw9hApxKDiYfAlqeV8zGbRmXmh2MCPab1i6f X-Received: by 2002:a17:906:dacb:b0:94e:e6b9:fef2 with SMTP id xi11-20020a170906dacb00b0094ee6b9fef2mr22875992ejb.67.1687711610657; Sun, 25 Jun 2023 09:46:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687711610; cv=none; d=google.com; s=arc-20160816; b=Yva5JiR0b7zlbzbR3Zw/SA1yK8TnFBbv0E4g4KVzt+IzEN/RPm05uQ9ig+p1Fd+8bD 1qwE9h2eXkHuMdWN1ZVN9x/llmW4T4HEQHiL3sV3YS94CIKDWatHP+tqe6PRadDapCgu s2i1IOVNaTqUAHrVKe1gVhtEZdU65i7DgHbOX98Et1CiHjTZOtzWPtjdSmKmBo+7zysV bZMES7phXZEW9l+forUM2jdktI7l3oJoy4zOtjj1lTbp5DLu0qMX+Kgg3f3gNvDRNwzw iQpzk6eTqO9JER/nDBAZpxKfFmjkwaQ6A1Mw7BXHqwt6cI8msNqkY5NGa4GybnYpfxYq vy4Q== 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=LcWzH/RHmwMa3/x+/zg00uCVAY2MK7RPL3Qa0SH0q0U=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=yS9I9gFWS7u72N1QSIUcYDXiLfoR1DVu76PTBBBKdb0Wr7NPx6Q+EYl7uPq8ssWuHm qDq6UIlsCN8+mWnL7InrNxvV57joT/4jZXTdxKiD/MiPjRv16hSsiXhc8w5X0e3h9ZP0 Y4hs9LP1/Ww9xNfIkORDmAgcsqbsliuFoozgwK9qN0DsTglIdATrKY/5xqZ00u0eJrMm YON6hQZo80t3dlQpfPugSmHdDp8G2fzxsGZBwxvO5KFK8z/uBvVl9/Pw42pIY9XtR4rk NQEDIevApkMfggzXFcpaKL3jb7cPq0o1RojonUhVi9T8Sa6rgMP2vKntodlZMkaW5u7a IGSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UlmhGix7; 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 ay21-20020a170906d29500b0096f65c97148si1697315ejb.714.2023.06.25.09.46.26; Sun, 25 Jun 2023 09:46:50 -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=UlmhGix7; 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 S231199AbjFYQaJ (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbjFYQ3j (ORCPT ); Sun, 25 Jun 2023 12:29:39 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8BDE1A6 for ; Sun, 25 Jun 2023 09:29:17 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-51d805cb33aso2092833a12.3 for ; Sun, 25 Jun 2023 09:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710534; x=1690302534; 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=LcWzH/RHmwMa3/x+/zg00uCVAY2MK7RPL3Qa0SH0q0U=; b=UlmhGix7s5v0WhZkyYVMXvB33R9ZUZPAYDNOZkYKTMgXi6rkhMM4Vc0XmOIFCG+VPJ Y/9NC31kGfA1YYnz7oOzt67TUwsNwLFNPK7n3Ve8KiHvQeNypruvpwoggl9xf8MZhH6Q wcrlngx+qd6mUA8fSlQ8K5JNLSGkFGxbMb5gOEriEV/xhbtkqHUoYBAZDZe5F5CTvzxo 41xpTQR0TgfNUnVVjDuWmy8TrC1cy4MiZGz0AwLBy4XnnJ5IA9Nv56PJCGMlrsnDJuy2 He6+gwMUR++usJd/7S0EdGCYRXktAjjB4PVcNQ+iH+1IdIjUaidrAOpYNdVoJQ0JpL6d fnPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710534; x=1690302534; 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=LcWzH/RHmwMa3/x+/zg00uCVAY2MK7RPL3Qa0SH0q0U=; b=Q2eYfwxJ8iq4+XPkFeqX52liLgHn+ZbhiYOHoMmBWVqCSq2qELDiTz+w6cUw9CisnF yYTwA6ZCEZiFPerS7ydfISLFudYW5eG7Gu2qpg7DFcr6gMlRQDJgylXL4vgS6bFHD2yT OhKU7P43r7Veo6L7xZ04dQ6/B2O1Z3KJP/MIJiMHldhs/0r79DcOTNv1Uif85mQNyjDN FKzKAR9DmbeMqGHCP8sgRMSazuCpBIVSeEcLOW6vyuOooPdARWr3aTjwVm7x1kRgyjLp MvaMhXlSYFBfgtzCJ/WB6k1YqmffYOEgBSKmM3cFdpUlVeo3YYOozsctqbMNshxeNjP1 eJUg== X-Gm-Message-State: AC+VfDxOM4s9JpWvnJJtxCbagLFe1eJIA9FJ8ryk06rkfXLQtZxDhJRk lcksq2p29HWein0TCwZ4sH1pVw== X-Received: by 2002:a17:907:3d94:b0:98c:d733:bf03 with SMTP id he20-20020a1709073d9400b0098cd733bf03mr12217721ejc.43.1687710534201; Sun, 25 Jun 2023 09:28:54 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:53 -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 17/24] Input: resistive-adc-touch - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:10 +0200 Message-Id: <20230625162817.100397-18-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=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?1769693889739874589?= X-GMAIL-MSGID: =?utf-8?q?1769693889739874589?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/resistive-adc-touch.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/resistive-adc-touch.c b/drivers/input/touchscreen/resistive-adc-touch.c index 6f754a8d30b1..7e761ec73273 100644 --- a/drivers/input/touchscreen/resistive-adc-touch.c +++ b/drivers/input/touchscreen/resistive-adc-touch.c @@ -210,12 +210,8 @@ static int grts_probe(struct platform_device *pdev) /* get the channels from IIO device */ st->iio_chans = devm_iio_channel_get_all(dev); - if (IS_ERR(st->iio_chans)) { - error = PTR_ERR(st->iio_chans); - if (error != -EPROBE_DEFER) - dev_err(dev, "can't get iio channels.\n"); - return error; - } + if (IS_ERR(st->iio_chans)) + return dev_err_probe(dev, PTR_ERR(st->iio_chans), "can't get iio channels\n"); if (!device_property_present(dev, "io-channel-names")) return -ENODEV; From patchwork Sun Jun 25 16:28:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112646 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6998242vqr; Sun, 25 Jun 2023 09:32:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6m9dyDuYG1StgUOUmcbi/IvdpPVmHjulvB03NglEBVfk+b6IOz+w93D75sciCteSj+jIcl X-Received: by 2002:a17:907:320a:b0:965:d18b:f03a with SMTP id xg10-20020a170907320a00b00965d18bf03amr23028863ejb.58.1687710734233; Sun, 25 Jun 2023 09:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710734; cv=none; d=google.com; s=arc-20160816; b=QbPjJYgNanwprHRDJavJJeiRC4Q6vY0IoYa61b6OZOsNannf/+1/oSahHabdSQY1PX egjdmqchFJ46rLQ/+6fsFv6WnGJo083l2yvC8fYa1JmOF96+ucqj4Mxkw6CXUL3rMzcz C3vuM1gTpEYdDbRTYpcWpOSqXN8AZw8EWGpOxMPM1BuZdXhHklyhrtxIqJ+XUo0A+KRI tMIIbBzMI7bteX+vOzT1uAvFb5L8Hi52PxV1gaZUL2LFdnIhebpAWih7hJUFF3OTmkrf VERqmsxNLkZoaaeK8PbbeSKqAEY9QZaVTYkolxOvvGEW1ffvm7vvpRi7nZeqAzsol6Qd 2R2w== 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=hBwWVyiT1or6L/qAtYaBPHGSvXZlvDgrfYi37JFCZ9A=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=uhC9bd6qVIRGg5zdzLkbpsOgWzicI/3n8mHuVKGph0IOD2hbO7cim86+8mvr6q1wRI +Wj4kbPY2Kzlo1hhWh4ZFA2/zMOl2kJXZ0vSVn77LbuVrI+fA3L4x1YIb+yfWLevGVcu MjG/LqZf8pjPDxRO3dzc6C9U7kEsfzz4K1NF/zV0/mpmkyTB6XLSLOCSJO1YFuoihE5A lBcQEHSqcaqUkXcPENxxa+HPlwYNJyAGJvVYwERk1Etcx761Wsw0r0uPgsBJ1/GcyZ0Q ur+tYdiIHEA13zfjJtwyit5ViByN+L54U6DWDkNjeyOZ2feb5cTKq4dL3sPopUVgheTd s5Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QPMfHgMk; 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 qx27-20020a170906fcdb00b0098ed8b2adf1si519240ejb.530.2023.06.25.09.31.50; Sun, 25 Jun 2023 09:32:14 -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=QPMfHgMk; 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 S231690AbjFYQaN (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231462AbjFYQ3k (ORCPT ); Sun, 25 Jun 2023 12:29:40 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41BAFE47 for ; Sun, 25 Jun 2023 09:29:20 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9741caaf9d4so194412966b.0 for ; Sun, 25 Jun 2023 09:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710536; x=1690302536; 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=hBwWVyiT1or6L/qAtYaBPHGSvXZlvDgrfYi37JFCZ9A=; b=QPMfHgMkgP1G4fF1llYySBCqeYS4EtgSTgIqSwonEoQJslqEOK3iRXl+ZBCpLQpjWm gcTiyfl+RCObIBJJVzDP42TPlz7Vw8+HmcS9fJ9f1H8rt3Ew9IhEjY+KMruiDE5cyoj9 TbTL5m33RNK+vdADYbLrldRcvEcguiJ9pFhd93bvy7JldyrRzpR4B0k6RiHdR1R44zNv krMEMtY/e69Pufm/yc2V3ZzCFx6NoF05hxOLL3G6X8o8/K/McPbdLG7b+49LMK9bIcV1 QrRe1U6V4cXUixc682+ITuHi5n/UGh8W1k4Eexr2VDLDbOYpodKa/PdhVnqJHNkCPI3D QXHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710536; x=1690302536; 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=hBwWVyiT1or6L/qAtYaBPHGSvXZlvDgrfYi37JFCZ9A=; b=eo+2t1dqRKvRN2aSwntKxwg+e3xVDbqQLfdggvVblA3WjSgjD09+OjHchD9i9ExLDq 5UEQUkAAz/feJZRsGlzQbrexGmVQlX6IHyZPyu/W1zRZpThi6S0LYQEx0yqATqGii0Kw MLv1sbeUlgotx+0Mbs/XnO/46JQhu25mchqXP0ktZsr9yZsNF4GjmOcrikyKwG1I2X80 LD9LYNIqJxtsDFDqVBgbkQCDiGOkPwfBJz9+7wQTua7olZ9qLUs3XKMJSzGyjlOLV0pm QxRTTVCitmtSUdfU2PIOVS1VkObUmy00TWxpjZ0+twUaFqCsjk6YYwCEiiUkaZOfx5Oy tITw== X-Gm-Message-State: AC+VfDypCBRTrrWl192C3prTGMSo4fmxHlnYK9x4moFs+lYCxQgsbgBn K+DJjJSotpz2fHPH4kJMK3Kd7Q== X-Received: by 2002:a17:906:6a25:b0:989:40a9:505d with SMTP id qw37-20020a1709066a2500b0098940a9505dmr14530283ejc.0.1687710536045; Sun, 25 Jun 2023 09:28:56 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:55 -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 18/24] Input: silead - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:11 +0200 Message-Id: <20230625162817.100397-19-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=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?1769692970615718756?= X-GMAIL-MSGID: =?utf-8?q?1769692970615718756?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/silead.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c index 9e28f962e059..62f562ad5026 100644 --- a/drivers/input/touchscreen/silead.c +++ b/drivers/input/touchscreen/silead.c @@ -706,11 +706,9 @@ static int silead_ts_probe(struct i2c_client *client) /* Power GPIO pin */ data->gpio_power = devm_gpiod_get_optional(dev, "power", GPIOD_OUT_LOW); - if (IS_ERR(data->gpio_power)) { - if (PTR_ERR(data->gpio_power) != -EPROBE_DEFER) - dev_err(dev, "Shutdown GPIO request failed\n"); - return PTR_ERR(data->gpio_power); - } + if (IS_ERR(data->gpio_power)) + return dev_err_probe(dev, PTR_ERR(data->gpio_power), + "Shutdown GPIO request failed\n"); error = silead_ts_setup(client); if (error) From patchwork Sun Jun 25 16:28:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6998289vqr; Sun, 25 Jun 2023 09:32:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Xr4GsvWFnG/szkrCJVeZyF6Addbgy0S0hesHUBJkDNTgcWO2mtRxW1KGUQfl1ve6UVLsW X-Received: by 2002:a17:907:da9:b0:989:7e02:2929 with SMTP id go41-20020a1709070da900b009897e022929mr12948840ejc.70.1687710739395; Sun, 25 Jun 2023 09:32:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710739; cv=none; d=google.com; s=arc-20160816; b=mimDNQnIsHShrOueDWQAoA8s5gqWVYC5y+B9QzTCA1bhxZPUxwfK0BbXwFnEmrkj2o BXgjPPwpnVIDfOfDS0oP94OweV11ugka+Xf6W82uGNvAt3W5EZT6vH8fGd5syCvxlwAX AMKTte+pcqNr5kbQRJMOjXplKcRhRREX77/3IC/v/Q0A17M7tNalpPl1UGOXHaZIPpVc ledYIs5QFqj0zszJe+KWLmQVfCvWeLDJxadmzZ5kvzWYY3VQwABU/+2al5rajDZKGlj9 r8iD3KfuLCoMwTrcE7XBMto78Q3YFpdfe7ydoOv+0is4eEPtgt35zdZa8WNHT/KXyoZV 6MpQ== 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=JmS3pJ1SyrLevST8bGOOD7yXt2zH6zG2iD3vhDp7X08=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=d1GptmvLWlSD/lhuZReorfRAdd9kp/bAlB6Gn2Yg6iRFmTFxYFt1e4EuyR/Lr9ST8D R3R4JfEfqW6DyzvtApDNWKlxKb2iBVmDC96o/uwLPFJaaP5t79KwQqJmYGEPxFa619fL AkrleGZAurkd8IckThg6QMxA9M2nAvM7Bt/puUI/Po9Bt2VelOaNB+Qac2MsnMlnftXF QLQ5wamufb8iX6P/vF17pPXNDQ8pkARHSSWSNr63jV3x7Wt3vZ7TY7P01R/7Zvqf0TTl mtI+eB0H5KqbaV5bOGSkaoJ8ORc5bPERoF1O7gyYjzVqT5NEKW9Z9qijWPQ470YamA4b Tipw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gTI8JU+Z; 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 uz14-20020a170907118e00b00970f0c11efcsi1855815ejb.339.2023.06.25.09.31.55; Sun, 25 Jun 2023 09:32:19 -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=gTI8JU+Z; 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 S231917AbjFYQaR (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbjFYQ3m (ORCPT ); Sun, 25 Jun 2023 12:29:42 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15864171A for ; Sun, 25 Jun 2023 09:29:23 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-98df69cacd1so73204166b.1 for ; Sun, 25 Jun 2023 09:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710538; x=1690302538; 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=JmS3pJ1SyrLevST8bGOOD7yXt2zH6zG2iD3vhDp7X08=; b=gTI8JU+ZA8Kr8RNGjDMmEGGx04B54DFxcjCoX05mV0tdcOiQ4/ZIBpJFZNDajO7s/5 QL2aWBoD+OfKOt2tAoJ7uTt42SwAznxpokPO5sZnwMPs2KGSNPlM+S13UJkE5iHwC1FO NsdjUL8HRmHUvJmp3UsD0RwKEKlIsjvpHVJj8spyjxzzusT6BsJWFzYc8K1ZJXjnhAmZ jAvL39DCwkF16P784MtycdiOLNy4fKQUTdHxK950v0WaUa2L1nSZQGPWXYXi7Fh37mO0 GAwHz0vxkoEDDxuoKGy52+dSO9bqSwf0SlyU0YVORQE29RC2sqfzZ/PclYPOPSpl5+qf IBrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710538; x=1690302538; 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=JmS3pJ1SyrLevST8bGOOD7yXt2zH6zG2iD3vhDp7X08=; b=mFyWElhVQvWZGUFMbrA4Nn/lcWp3qX3Vl3q9Gl2IguVhewK9oAmTjrL36nhYPMW71y Ftmfj5/qBkIJ3YPOpW49JhBsRzny6DMZ+lH6PHT0WLX7FNR5L3jdd/25Yfz0jRTWnjhC 0ydtuc7abRSmPqseCcUer4HjqDyakREnw96p7vQywkxpcFNQL8WGuKTrur4lh2BJ1Yju q+42zqD947mH+iIV/hK/p68CGFnVFzYsJqCzah2G3OEaLQG/9SA3nE2tStJ3UcV1WmNF 5ww1v3DL1ixmvztJc6RnOcPM1rPs6tSzbbbt5JCA47gWIckTFRGczko2FwRF9O42oF2t iSGg== X-Gm-Message-State: AC+VfDxg2obNQWYhiPNaUYbAvHOoz5EfL7bLae3SrOEQNBqhSNxRREN5 MJ0Y2wSLW++H3gHNVgDadjGbRw== X-Received: by 2002:a17:907:2be7:b0:98e:2b00:c509 with SMTP id gv39-20020a1709072be700b0098e2b00c509mr1551774ejc.30.1687710538039; Sun, 25 Jun 2023 09:28:58 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:57 -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 19/24] Input: sis_i2c - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:12 +0200 Message-Id: <20230625162817.100397-20-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=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?1769692975894753528?= X-GMAIL-MSGID: =?utf-8?q?1769692975894753528?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/sis_i2c.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/input/touchscreen/sis_i2c.c b/drivers/input/touchscreen/sis_i2c.c index 426564d0fc39..ed56cb546f39 100644 --- a/drivers/input/touchscreen/sis_i2c.c +++ b/drivers/input/touchscreen/sis_i2c.c @@ -310,23 +310,15 @@ static int sis_ts_probe(struct i2c_client *client) ts->attn_gpio = devm_gpiod_get_optional(&client->dev, "attn", GPIOD_IN); - if (IS_ERR(ts->attn_gpio)) { - error = PTR_ERR(ts->attn_gpio); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "Failed to get attention GPIO: %d\n", error); - return error; - } + if (IS_ERR(ts->attn_gpio)) + return dev_err_probe(&client->dev, PTR_ERR(ts->attn_gpio), + "Failed to get attention GPIO\n"); ts->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(ts->reset_gpio)) { - error = PTR_ERR(ts->reset_gpio); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, - "Failed to get reset GPIO: %d\n", error); - return error; - } + if (IS_ERR(ts->reset_gpio)) + return dev_err_probe(&client->dev, PTR_ERR(ts->reset_gpio), + "Failed to get reset GPIO\n"); sis_ts_reset(ts); From patchwork Sun Jun 25 16:28:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6998346vqr; Sun, 25 Jun 2023 09:32:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7iRJOHSMy5PhsDy0z4CXcotW7tguRMA75V2lpJ2QzsdP/UUNOQ4YOCzRoe/2DeRplCmepE X-Received: by 2002:aa7:de11:0:b0:51b:ea1d:bc31 with SMTP id h17-20020aa7de11000000b0051bea1dbc31mr6036325edv.26.1687710745686; Sun, 25 Jun 2023 09:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710745; cv=none; d=google.com; s=arc-20160816; b=sdUfeZ0xPFBLfTtJB/LdPKUhoLlEBNgbBsxWlpQpHG44ysK6UsKifcFvcNHvDkVBgw 46vZutC5ZL1H741N1V15euXXw4SGE+8VUrfa0vrBm7Pimt33Nd8y7VkEPvUPNSE9NwSu ONsWhhxemMH0LtRXovniXYIR3ZZ8ca314aKm556MjKU6yj7VZdnOR6htc6HG0bJuTQhZ vaD+/BySmC9istryRG0pvpa2LSc73iko/OjYfNsLbpyrPTE3ZNLRl+NJTW8kjbeGm5tN h5LVRK/5jxhSFIaXCb15TAtR4WGLXGHyH3FcYspkKH28VYQAGFJGFT+zXL+kV+lCYWXn vw6Q== 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=dFNLWz5nb9xBhB40IBJoDah+KxzePJk8q7QGRODucW0=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=ltdoMVCOP6+AkJ1lRwWhhvjfh/L0Gv6I/2wRapneYI1kAMFKpnr7/cnzIjczvAF6Mo mPevjjTNkZbhjA09RGoSaNUG+URfr4ge65cfq3pyLYPxz9q5/s2ZPjtNxFbeAd7sC/8l bdaQhA8JC8S6+W99jTIdhKrZbllzM7oJk50n0dfakxbdMQ0gfZPbB0IF/g3XCPvKPobj 9faHNBWbL0W1cWZmMFVMyYs2YTDRval8vhb05TBnmqvemBScAKiDy21c1wOrqQrABUY1 JyzEyK4lumlWruIaq0jg+uZQRxxsaw5XDKla4O+KZvFj64W1kb3fjYjDTRYnJF03WEft 7GWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ob0lMxAw; 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 f8-20020aa7d848000000b0051a2168bb64si1673245eds.389.2023.06.25.09.32.02; Sun, 25 Jun 2023 09: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; dkim=pass header.i=@linaro.org header.s=google header.b=ob0lMxAw; 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 S231935AbjFYQaU (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231387AbjFYQ3o (ORCPT ); Sun, 25 Jun 2023 12:29:44 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADC9AE71 for ; Sun, 25 Jun 2023 09:29:26 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-98df69cacd1so73205666b.1 for ; Sun, 25 Jun 2023 09:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710540; x=1690302540; 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=dFNLWz5nb9xBhB40IBJoDah+KxzePJk8q7QGRODucW0=; b=ob0lMxAwJrExIVf3oDeXjQ+jA6kXqRF/1aB785MgbNcpsFJMzGAFqFqFU3QJ0Wx437 lf0QxL+6yym9EKpnkTrjiXQrQVauNv88Ex2a2QmeV3DI9cHL9R6z2laDzsULdZ38iXPk bENqFNUI9+CT3IE4JUaecgT+iPnkQ6zSGhSYOQN7KALHcjUy/hTk8Wq9vhfkkkiYlb3X fjA5Tyu406KjZ5NozbmI1U710BcMxDQVNB0rrCFGYpRjGlmqry/P4F2XRtX4wxy3OF8i HLe+1P+BO9bOe9oMJ3TanB7IJemcN4HveJ7rSuASMevLNsP9iMKp3mFoRTBVK89M4PYQ 9FVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710540; x=1690302540; 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=dFNLWz5nb9xBhB40IBJoDah+KxzePJk8q7QGRODucW0=; b=VXwrk52hRZB+ECgKg48V9ZCSokaaeK88//MCPgmQodUyF6QqHICllqwEIiNnoAaLq3 Dji2dGtE4A6WDasOCcoHePbn9plVUhXfi9Pvyaab3DeU02JxiRZMPl5kdlve9iGU4OFh dyqzF6cciZ1X2yYl7zXZm0+ayzChsnMnByQ8EkwyCF2ATOm3y7a2lqNr7GrijHaPaE8E f96lHbMo0S5XiQ+4t5/GzUtF8qC1+h5lYug+Kv5J4G/4u5gWQMjJI2cPMVJvi1b04qvo PuL1g3TGNaQzcPmS/T3LKf+VJVah1oHP3w1JTom6p1kgHDEGvBG5xmlybSWBiChTjh37 6LMA== X-Gm-Message-State: AC+VfDx78iCT1qGClx/oEZFMgRO+Fq1pC9GlF8S8BiqU6AvZ7dL81ElD UB/a71KZlHaqs0xwThKx5OF8gw== X-Received: by 2002:a17:907:96a5:b0:988:76ed:e55e with SMTP id hd37-20020a17090796a500b0098876ede55emr21352012ejc.13.1687710539927; Sun, 25 Jun 2023 09:28:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:28:59 -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 20/24] Input: surface3_spi - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:13 +0200 Message-Id: <20230625162817.100397-21-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?1769692983129758035?= X-GMAIL-MSGID: =?utf-8?q?1769692983129758035?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/surface3_spi.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/input/touchscreen/surface3_spi.c b/drivers/input/touchscreen/surface3_spi.c index 31d140248f2e..7efbcd0fde4f 100644 --- a/drivers/input/touchscreen/surface3_spi.c +++ b/drivers/input/touchscreen/surface3_spi.c @@ -221,7 +221,6 @@ static void surface3_spi_power(struct surface3_ts_data *data, bool on) */ static int surface3_spi_get_gpio_config(struct surface3_ts_data *data) { - int error; struct device *dev; struct gpio_desc *gpiod; int i; @@ -231,15 +230,9 @@ static int surface3_spi_get_gpio_config(struct surface3_ts_data *data) /* Get the reset lines GPIO pin number */ for (i = 0; i < 2; i++) { gpiod = devm_gpiod_get_index(dev, NULL, i, GPIOD_OUT_LOW); - if (IS_ERR(gpiod)) { - error = PTR_ERR(gpiod); - if (error != -EPROBE_DEFER) - dev_err(dev, - "Failed to get power GPIO %d: %d\n", - i, - error); - return error; - } + if (IS_ERR(gpiod)) + return dev_err_probe(dev, PTR_ERR(gpiod), + "Failed to get power GPIO %d\n", i); data->gpiod_rst[i] = gpiod; } From patchwork Sun Jun 25 16:28:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6998396vqr; Sun, 25 Jun 2023 09:32:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6RtYpKKHCacFmoWrRKq+FPqy/64BZ5z0l/pW2HecPCN2AmqJXDgCYKGLEUTH3/1UKxIdC6 X-Received: by 2002:a17:906:5d0c:b0:988:71c8:9f42 with SMTP id g12-20020a1709065d0c00b0098871c89f42mr20627566ejt.8.1687710753782; Sun, 25 Jun 2023 09:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710753; cv=none; d=google.com; s=arc-20160816; b=Pxqn3zRrqB6BeCUWljR8rDy7yNaRjJMckpJ6hE5KnA2Ah3V4BqIwLZb2tSJWpnSplY Ebao6J2LHPBVsDrYMCDTebN80/KLU4m4av59g8ZTcTDDAJ3ikkXt2qlAmJYuah5ceNsN iJN4W/28NP8HOcniLmBI6kj144h83kkPJU/oAK3j0DcVUwWOMcok/muc8n9xH5cTyVSI qAD1z4Xmt2mznZpLwmPoXAU0LD3HIj5bURgu9nIRTZTz9aKMQqf0aMNF8nKoKFHliBr3 bMCYOcvoGnR4iEf9l7wmVGjQIuxPyA+JA0LmeK0+OPjHODBiV0UUkbk621nxablN+Pzy nXaw== 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=+eG4JxfUU5OHHCechxQb+4pnO54NYHWPt20ucibo4lY=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=ByCjoOiPyegaDSp2yDFvEN/5mRW0rw38UbtPzowwl+1M+Iqvc5pkCkOGoksmdvxb8U QnUAzYs46tPyrbxCQng45ucFPy8sBLW7vVBvKfpp3Ysh1ndCYDLwNgPcH4LnaqGk/tB4 Y+OSPwAwY4HRNZMI+I8CRR8B2Q1l1O2WbXHps7mo/G2a8l2fJSlQ/eQ/qzDJG9lVzZkw FUF6Ll8Wk4MzOxQC4CTX3tQNE44Ns8WjMPHPp3qENhglA/n939WmVVm/tnPqxKGlqNC9 Yktjl4QtMXjupmfDW8K6pK7IUhfJKSiaOdtFd7w2Ub078Q4vdCRikn1Bthu3RrxTdN28 g0bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vpgYRQDg; 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 gr1-20020a170906e2c100b00974d5816686si1901444ejb.66.2023.06.25.09.32.08; Sun, 25 Jun 2023 09:32:33 -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=vpgYRQDg; 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 S231945AbjFYQaY (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229679AbjFYQ3o (ORCPT ); Sun, 25 Jun 2023 12:29:44 -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 A721A172A for ; Sun, 25 Jun 2023 09:29:27 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-98df69cacd1so73207666b.1 for ; Sun, 25 Jun 2023 09:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710542; x=1690302542; 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=+eG4JxfUU5OHHCechxQb+4pnO54NYHWPt20ucibo4lY=; b=vpgYRQDgbfrJZi4G3H9i5osvGe/QUrJCZaBZ6brT2dDynlvhwjMrnarKaXvQSmkDu9 LEf0QicKYroQPJbEbe8927u7FbOzTMS/wcQkObAqvj/husrdLsBZHJC7X5A1CHZ2WHFy YkCMHJ9y9YZGBx+HbYiXVRkKH0WnYvrch4cXyVbRLa8MdEQckIob+hkQ5TznlSu1so4c CaZEG4/CvA2BQhDPT0N+C63/IHMVKQsKtS3btGTxZCq+JzALBAoG2SJt+zK65FsY02jF MVZdNKSnzqfDmtNZUQqK8But8lp/IA5oAJ6FmtYWQOOnccakW78mF+0hd90Wto2V7pDD M1zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710542; x=1690302542; 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=+eG4JxfUU5OHHCechxQb+4pnO54NYHWPt20ucibo4lY=; b=kX06CJZM+fU9dcCnb5YoKuip3oBu93Bxv4W1z5aG35hdZDyV4PmUciQ2hfglguOl4s MIRxJL5FvP59DKzDBXJEfLT5cCeJqL2LL/nQ1I7hgZvxjU/RNnsShuAeTtd+vRnwP7w9 Xs/zjMf7uAUcf0bKqVvuCKkfndqGUCc0cTpEZsdmwnaVTpdupv4nu81JrxHhhwILqUJo jzcq9qZM2GkXdmt7JHwlmeUtkvv+gEPkG1CPVuN7/5LjdglK3t0pgfbCV/4IRP25l8cw HtDACBF2cYJlaxAvGF42+UXeMVsa1ivA469rs8kRN27P1st5shSeGvp6pjwH/SrscMdN KrIA== X-Gm-Message-State: AC+VfDw8W2R3IRrjSxD0VQhxBPRbFyaBiZAMoIOxYsO1O57wAefVv05k K/g2qpZK+WVuM05qFmk+ZuJjd/VGOxU7Uv2ePII= X-Received: by 2002:a17:907:7811:b0:98d:9dfe:e9b3 with SMTP id la17-20020a170907781100b0098d9dfee9b3mr4531048ejc.24.1687710541832; Sun, 25 Jun 2023 09:29:01 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id ec10-20020a170906b6ca00b00982be08a9besm2277731ejb.172.2023.06.25.09.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:29:01 -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 21/24] Input: sx8643 - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:14 +0200 Message-Id: <20230625162817.100397-22-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=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?1769692990872127095?= X-GMAIL-MSGID: =?utf-8?q?1769692990872127095?= 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 Reviewed-by: Andy Shevchenko --- drivers/input/touchscreen/sx8654.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c index 0293c493bc79..f5c5881cef6b 100644 --- a/drivers/input/touchscreen/sx8654.c +++ b/drivers/input/touchscreen/sx8654.c @@ -323,13 +323,9 @@ static int sx8654_probe(struct i2c_client *client) sx8654->gpio_reset = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(sx8654->gpio_reset)) { - error = PTR_ERR(sx8654->gpio_reset); - if (error != -EPROBE_DEFER) - dev_err(&client->dev, "unable to get reset-gpio: %d\n", - error); - return error; - } + if (IS_ERR(sx8654->gpio_reset)) + return dev_err_probe(&client->dev, PTR_ERR(sx8654->gpio_reset), + "unable to get reset-gpio\n"); dev_dbg(&client->dev, "got GPIO reset pin\n"); sx8654->data = device_get_match_data(&client->dev); From patchwork Sun Jun 25 16:28:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112654 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7000419vqr; Sun, 25 Jun 2023 09:37:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5uMiqh6X27AU48NXSvIyAxpwuy0RYNDP6oP2Rtc72qJ1MhHAeopXYn1y9z2hXjOCYNU0yy X-Received: by 2002:a17:907:1b0b:b0:982:8ec0:15a3 with SMTP id mp11-20020a1709071b0b00b009828ec015a3mr23365175ejc.67.1687711044240; Sun, 25 Jun 2023 09:37:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687711044; cv=none; d=google.com; s=arc-20160816; b=GhDCXmwbwsuaIK0INhA5JxIDtLrgDxJ0navaAHFdIceh/EMuu/niHgAuN2RPRJsDK4 HFWp7RvvIZalbWu9z5mi4deh2sbNa4L7e4MMxOiLK7WJO5u4VtVGMjnMb5jGcmjcvE9V cHW3l/5mYiP+irKWV7azTEIN1TiTycdF4TfqXhe4S8GyVxoLhVsJoQQIBtKSzwtgvHBf VWhFrdMzHeDeKaRe6J//CILfBhngQ30mGY/uKPKjgF1Nwm298CkgY+3sK5MZuGmKKOwU UnldvtGbKdmmAv0ByAGa5ZgBkhRiu1CQBg5bFU6yxJbH7jthxYz1v6ibgmOvLceA918O 5P7Q== 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=hrK9BhmeRbtcXzgi7rTTXpnSu/d5rWV1MCplOE4+PiY=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=xjGAmmUiG4xG7JXYxyqEaKF55MDtUEBx36xZ992F2iBa3P1vjKYWz2ZWrehWFdXoCb 03JIHe9o+qI1hp0hwKy803uJT7RdEfgK0GSOTb1LUocIeDF3wgrtleWHkTBFSqwt6tqs hO2voRVyIbmJ0PlE8DpGQVVov6aib5F4dMFSWPNp+BQRl7IkV0GUDlxJggQJybIeaXAH u3wq5EirC8DO8ZnxKVSAa4oVz3p0LvvOHlfx1Dbbrb2AfJdH1Vp1lorG45RboUuR4vZ8 YqiXyBPbbFwAXv6Ms6Scbu6moDWnikdmMpdoyMGnS0S6FWi4GweCirCnspDlwX5aXYWa zSTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qr9LMO/Q"; 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 k21-20020a170906055500b00977e0843714si1713165eja.1002.2023.06.25.09.37.00; Sun, 25 Jun 2023 09:37:24 -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="qr9LMO/Q"; 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 S231962AbjFYQa1 (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231292AbjFYQ3q (ORCPT ); Sun, 25 Jun 2023 12:29:46 -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 5CE79E4C for ; Sun, 25 Jun 2023 09:29:30 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-98e25fa6f5bso160146866b.3 for ; Sun, 25 Jun 2023 09:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710543; x=1690302543; 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=hrK9BhmeRbtcXzgi7rTTXpnSu/d5rWV1MCplOE4+PiY=; b=qr9LMO/Q+uU19l25OB/u4TWDpd9xHm9oJH3Foo76AbbHQctIYRf5ZUFkY8L9AiHLl4 IOGoE/YwDvYjQ7Z/RoI8LAsyAb0Oou9jV/eNjnv0tRqSdclfwqq5uy94d6B0rnmCPUUR iSLOq5KkZanLgOR/nRBhyLxHONuPzS/nAZpnltsISPxUbmC0LUfNyXpYLU0YpLs1vWve AC96ifIl+9PInt0WomEwgqB0VL3ODDiMvq9dIQEL7Sq3bYrqAHuOVxVLoe7A0CTRvKCZ mcw9tPNo76ttBFw4192eFXvpbfamJYHlQPGZpjvPhBEBJagw7rmSeUJ7CKA6ktmCZMlI AgRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710543; x=1690302543; 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=hrK9BhmeRbtcXzgi7rTTXpnSu/d5rWV1MCplOE4+PiY=; b=QgV+3sNIqE98BeTK555xxL/Sh7tx6F1xtbQ/+eNLRSB1oGMHmg3fcpBmhMU6DAMinn ZlQshJI/9DjMEYDYOmsGN1w8YVcirwpsjYDOkiR+0p7PTWChNCavSUrISJV857av0MB1 KG2a0gePzW1FyT9MHII2nuCwYhCtDX6LJMxrNTNNkB7SfQpfTYRVU7VJjbIfknOYzidl liXeSxvX5C8UAbU3rJK9UU71pceJZbSgbAPZnSKDfR4uOYVeAW7hxCUoQIKadPT/lLdP jelzd2KRNYLYjD5yhpHA69gcY6pQWwfx9FlFRgyEQ629FVCbpkRJfx9WjgHRBz0NSIi8 MCEQ== X-Gm-Message-State: AC+VfDwZckBC8t1MNbjXwaoxeWVucM5fLQtoAn3vxce/ICoPHC7FB13d 3CWnBZoFf53KVB0hFsdJTxCvDw== X-Received: by 2002:a17:906:58c5:b0:988:891b:28c6 with SMTP id e5-20020a17090658c500b00988891b28c6mr20998191ejs.15.1687710543723; Sun, 25 Jun 2023 09:29:03 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id ec10-20020a170906b6ca00b00982be08a9besm2277731ejb.172.2023.06.25.09.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:29:03 -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 22/24] Input: bcm-keypad - Simplify with dev_err_probe() Date: Sun, 25 Jun 2023 18:28:15 +0200 Message-Id: <20230625162817.100397-23-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=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?1769693296109657240?= X-GMAIL-MSGID: =?utf-8?q?1769693296109657240?= Common pattern of handling deferred probe can be simplified with dev_err_probe() and devm_clk_get_optional(). Less code and the error value gets printed. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Hans de Goede Reviewed-by: Andy Shevchenko --- Changes since v1: 1. Use also devm_clk_get_optional() --- drivers/input/keyboard/bcm-keypad.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/input/keyboard/bcm-keypad.c b/drivers/input/keyboard/bcm-keypad.c index 56a919ec23b5..05b09066df84 100644 --- a/drivers/input/keyboard/bcm-keypad.c +++ b/drivers/input/keyboard/bcm-keypad.c @@ -365,17 +365,11 @@ static int bcm_kp_probe(struct platform_device *pdev) return PTR_ERR(kp->base); /* Enable clock */ - kp->clk = devm_clk_get(&pdev->dev, "peri_clk"); + kp->clk = devm_clk_get_optional(&pdev->dev, "peri_clk"); if (IS_ERR(kp->clk)) { - error = PTR_ERR(kp->clk); - if (error != -ENOENT) { - if (error != -EPROBE_DEFER) - dev_err(&pdev->dev, "Failed to get clock\n"); - return error; - } - dev_dbg(&pdev->dev, - "No clock specified. Assuming it's enabled\n"); - kp->clk = NULL; + return dev_err_probe(&pdev->dev, error, "Failed to get clock\n"); + } else if (!kp->clk) { + dev_dbg(&pdev->dev, "No clock specified. Assuming it's enabled\n"); } else { unsigned int desired_rate; long actual_rate; From patchwork Sun Jun 25 16:28:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp6998637vqr; Sun, 25 Jun 2023 09:33:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ZJOD3eBJz1BEiYXqCyaMfi6TopujVsWD1vmhPD9WSyFilP0GeCA5JTqHrxMGW9mDly769 X-Received: by 2002:a05:6402:190a:b0:51a:493e:3212 with SMTP id e10-20020a056402190a00b0051a493e3212mr23277342edz.17.1687710787671; Sun, 25 Jun 2023 09:33:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687710787; cv=none; d=google.com; s=arc-20160816; b=byO1nygfg/IATbsVNzM7emHHwoxfVGsLdm3vS3vT9gA2dlAaOtqXwT7MdcqNS8ZoZn +e/cM6f2IRzvfhiwU8v4yrphmYfoxwdtRopogBM5LAGK8TtlkIZ4k2AKnDPySu6zaeWe 8PBiOCS0LlZl7wUZhkDbXnR8iZpMUPpH46F6MZkHiXJBZGt2F87GZFjSSpevOO9TF7Dq 5ZIYB9NM6lzsUXLpgkaFn51IvP59kwwGRfZ4HUypQFpjs12v0kKjdDP6MaZvm/X/CChn 1yvyjswemJWCxcTgwwKt7ZTPRI1qnQrQ2tZjr/Z/Vqya5kWIfULMuabE9cKiA2WCOdhU KT0Q== 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=XIYC5RHCUmHOYXB4rEzcPmseZLQl8WhYPFeXh6HSghs=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=vY0Oskdd6AWm0IKO1WqchKFW//8CI89P6RVTDOs+EPN08aKpD9qKL621pNaQQbBCys 1iStdpQWok6NNULxJUA87DuQay0w1eI6QBZ2LgMmi/zyId7w/UDXwi75mSNhbTAx9xiO 77w/jxevznePkh8XDahmo5mw3aDEzhco35GHl0Sp/7juAQaynoqD/lBqeARt4Bt0EwdV mc2oZuXthYOP4EPQv5HHA8s/WFFSEAlSC1P5ldw9lskOk7A6L2CqZrAd9BJ2L1hYnyAh r7qIcN6mbP6r3g9kJbXqE6iZpL2ChCbPD+1u3Ax21CIXramAahuLYCO5eNL4YM6QyFrI fJQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xH3FhA04; 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 b25-20020a056402139900b0051836749133si1689605edv.494.2023.06.25.09.32.43; Sun, 25 Jun 2023 09:33:07 -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=xH3FhA04; 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 S231974AbjFYQab (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231623AbjFYQ3t (ORCPT ); Sun, 25 Jun 2023 12:29:49 -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 6EB3119AB for ; Sun, 25 Jun 2023 09:29:34 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-98e109525d6so182664966b.0 for ; Sun, 25 Jun 2023 09:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710546; x=1690302546; 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=XIYC5RHCUmHOYXB4rEzcPmseZLQl8WhYPFeXh6HSghs=; b=xH3FhA04qFZBGJXE48A4RzYemkesixHL9/B3HxrhIRp3eF67XxCcL9xfgwALWocg0u +xW6afSWOw0xhBojG/J8RAT/NxKmqFfz4Z1+43w2Dt29MaGVcoenrxDDgcc0hWJbYvvT 28eSQlO6pOMDcZ0l6nu6sgQCxjYtM0PrScnmYCCCOLsgiUjwGjN6cSJfxzCru47GPxyl lMixvzjIGsXJSdMxobecCT/KR1DGpg7fg35SvpGhuOM9HqLMMkwSTb2YjpEq7dn60XN3 061RBK3XGX9n0OurOehnpqa/nMUNqRzXuWnVfU7ReWtd+uK1R85bR/cIN7VhV82n8a0h 3zGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710546; x=1690302546; 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=XIYC5RHCUmHOYXB4rEzcPmseZLQl8WhYPFeXh6HSghs=; b=jm8SINtlazh81TzRxnDmT4Rc9wYT8o1bMbhpApgLkxonH6UUDy8ZgVBKuXDC+p2nVm O6aYUfV63SbpeeKhMYL0kXhwV3ian9CircZM+NMwXHcXUrn51brsSiGXGfJNH1Qci9g2 oSOh158O6L8R4GaDDvcUOi8ccxSCyBbq1bjBdSc5tUxraKYy90khYuP0TExdp//q6Ok6 0UEe1SAhFkalQSzjqU1gzFux/m2Hxu5zdB+gPsnVyiDvljvz4wZN15KjdcOODmY8+7ke vPB9nklnh6x4TQgLBqDc/UcFqTGLsHonEqxNjG/Nbm78M7A5aObOJjx5rii5LVcyUR2w tW0Q== X-Gm-Message-State: AC+VfDzn+QMAi4WIwoldPSncMi7MSpQ+7rIzycNrY4KnlZuQKgjcvOw1 yRFOsf7Ov+tgHTfwm2VXtwZ4xw== X-Received: by 2002:a17:907:360a:b0:982:a022:a540 with SMTP id bk10-20020a170907360a00b00982a022a540mr27049924ejc.11.1687710546129; Sun, 25 Jun 2023 09:29:06 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id ec10-20020a170906b6ca00b00982be08a9besm2277731ejb.172.2023.06.25.09.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:29:05 -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 23/24] Input: bu21013_ts - Use local 'client->dev' variable in probe() Date: Sun, 25 Jun 2023 18:28:16 +0200 Message-Id: <20230625162817.100397-24-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=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?1769693027318994879?= X-GMAIL-MSGID: =?utf-8?q?1769693027318994879?= 'dev' is shorter and simpler than '&client->dev' and in few cases it allows to skip line wrapping. Probe function uses '&client->dev' a lot, so this improves readability slightly. Suggested-by: Andy Shevchenko Signed-off-by: Krzysztof Kozlowski Reviewed-by: Andy Shevchenko Reviewed-by: Linus Walleij --- Changes since v3: 1. Correct suggested-by tag. Changes since v2: 1. New patch --- drivers/input/touchscreen/bu21013_ts.c | 61 ++++++++++++-------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c index f811677a59f7..652439a79e21 100644 --- a/drivers/input/touchscreen/bu21013_ts.c +++ b/drivers/input/touchscreen/bu21013_ts.c @@ -410,31 +410,32 @@ static int bu21013_probe(struct i2c_client *client) struct input_dev *in_dev; struct input_absinfo *info; u32 max_x = 0, max_y = 0; + struct device *dev = &client->dev; int error; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { - dev_err(&client->dev, "i2c smbus byte data not supported\n"); + dev_err(dev, "i2c smbus byte data not supported\n"); return -EIO; } if (!client->irq) { - dev_err(&client->dev, "No IRQ set up\n"); + dev_err(dev, "No IRQ set up\n"); return -EINVAL; } - ts = devm_kzalloc(&client->dev, sizeof(*ts), GFP_KERNEL); + ts = devm_kzalloc(dev, sizeof(*ts), GFP_KERNEL); if (!ts) return -ENOMEM; ts->client = client; - ts->x_flip = device_property_read_bool(&client->dev, "rohm,flip-x"); - ts->y_flip = device_property_read_bool(&client->dev, "rohm,flip-y"); + ts->x_flip = device_property_read_bool(dev, "rohm,flip-x"); + ts->y_flip = device_property_read_bool(dev, "rohm,flip-y"); - in_dev = devm_input_allocate_device(&client->dev); + in_dev = devm_input_allocate_device(dev); if (!in_dev) { - dev_err(&client->dev, "device memory alloc failed\n"); + dev_err(dev, "device memory alloc failed\n"); return -ENOMEM; } ts->in_dev = in_dev; @@ -444,8 +445,8 @@ static int bu21013_probe(struct i2c_client *client) in_dev->name = DRIVER_TP; in_dev->id.bustype = BUS_I2C; - device_property_read_u32(&client->dev, "rohm,touch-max-x", &max_x); - device_property_read_u32(&client->dev, "rohm,touch-max-y", &max_y); + device_property_read_u32(dev, "rohm,touch-max-x", &max_x); + device_property_read_u32(dev, "rohm,touch-max-y", &max_y); input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0, max_x, 0, 0); input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0, max_y, 0, 0); @@ -454,14 +455,14 @@ static int bu21013_probe(struct i2c_client *client) /* Adjust for the legacy "flip" properties, if present */ if (!ts->props.invert_x && - device_property_read_bool(&client->dev, "rohm,flip-x")) { + device_property_read_bool(dev, "rohm,flip-x")) { info = &in_dev->absinfo[ABS_MT_POSITION_X]; info->maximum -= info->minimum; info->minimum = 0; } if (!ts->props.invert_y && - device_property_read_bool(&client->dev, "rohm,flip-y")) { + device_property_read_bool(dev, "rohm,flip-y")) { info = &in_dev->absinfo[ABS_MT_POSITION_Y]; info->maximum -= info->minimum; info->minimum = 0; @@ -471,50 +472,46 @@ static int bu21013_probe(struct i2c_client *client) INPUT_MT_DIRECT | INPUT_MT_TRACK | INPUT_MT_DROP_UNUSED); if (error) { - dev_err(&client->dev, "failed to initialize MT slots"); + dev_err(dev, "failed to initialize MT slots"); return error; } - ts->regulator = devm_regulator_get(&client->dev, "avdd"); + ts->regulator = devm_regulator_get(dev, "avdd"); if (IS_ERR(ts->regulator)) { - dev_err(&client->dev, "regulator_get failed\n"); + dev_err(dev, "regulator_get failed\n"); return PTR_ERR(ts->regulator); } error = regulator_enable(ts->regulator); if (error) { - dev_err(&client->dev, "regulator enable failed\n"); + dev_err(dev, "regulator enable failed\n"); return error; } - error = devm_add_action_or_reset(&client->dev, bu21013_power_off, ts); + error = devm_add_action_or_reset(dev, bu21013_power_off, ts); if (error) { - dev_err(&client->dev, "failed to install power off handler\n"); + dev_err(dev, "failed to install power off handler\n"); return error; } /* Named "CS" on the chip, DT binding is "reset" */ - ts->cs_gpiod = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH); + ts->cs_gpiod = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(ts->cs_gpiod)) - return dev_err_probe(&client->dev, PTR_ERR(ts->cs_gpiod), - "failed to get CS GPIO\n"); + return dev_err_probe(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, - bu21013_disable_chip, ts); + error = devm_add_action_or_reset(dev, bu21013_disable_chip, ts); if (error) { - dev_err(&client->dev, - "failed to install chip disable handler\n"); + dev_err(dev, "failed to install chip disable handler\n"); return error; } /* Named "INT" on the chip, DT binding is "touch" */ - ts->int_gpiod = devm_gpiod_get_optional(&client->dev, - "touch", GPIOD_IN); + ts->int_gpiod = devm_gpiod_get_optional(dev, "touch", GPIOD_IN); error = PTR_ERR_OR_ZERO(ts->int_gpiod); if (error) - return dev_err_probe(&client->dev, error, "failed to get INT GPIO\n"); + return dev_err_probe(dev, error, "failed to get INT GPIO\n"); if (ts->int_gpiod) gpiod_set_consumer_name(ts->int_gpiod, "BU21013 INT"); @@ -522,22 +519,20 @@ static int bu21013_probe(struct i2c_client *client) /* configure the touch panel controller */ error = bu21013_init_chip(ts); if (error) { - dev_err(&client->dev, "error in bu21013 config\n"); + dev_err(dev, "error in bu21013 config\n"); return error; } - error = devm_request_threaded_irq(&client->dev, client->irq, - NULL, bu21013_gpio_irq, + error = devm_request_threaded_irq(dev, client->irq, NULL, bu21013_gpio_irq, IRQF_ONESHOT, DRIVER_TP, ts); if (error) { - dev_err(&client->dev, "request irq %d failed\n", - client->irq); + dev_err(dev, "request irq %d failed\n", client->irq); return error; } error = input_register_device(in_dev); if (error) { - dev_err(&client->dev, "failed to register input device\n"); + dev_err(dev, "failed to register input device\n"); return error; } From patchwork Sun Jun 25 16:28:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 112661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7003869vqr; Sun, 25 Jun 2023 09:47:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Md+T3qaRYW95XPw3tiL5CRXG/bwzFObzVjHRLURejExFUY9tjWnnj8v6tf4r94QJ4ESMh X-Received: by 2002:a17:907:928d:b0:953:8249:1834 with SMTP id bw13-20020a170907928d00b0095382491834mr22723927ejc.16.1687711634286; Sun, 25 Jun 2023 09:47:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687711634; cv=none; d=google.com; s=arc-20160816; b=DotVMOZJGjJMvMkw70BgDPcq29nnrVNfvORdD45xQMjxf6GV5+aEgeaEpTegnHQ+9G vjW72kDAeXXLIeD79GQOiam8bkXpATZWm/bdGAcBRRUx6o9EuktWSMr02VADF/ua06aS X21d8dGLez4u+tYxnPrAfZiYEEY0f6p7Ni9BFNqfXugnOA6ZjaLWOe/h/mgu4XgyluvI cgF9v2kdSJVU2cwGcBmZMJxLou5vMq5QDhqPenS8vU0xvwPubvevwaXCB+YBxI8vuMMk qz6q7v6p3z3oNQEkXgAGngxcEFZ5GOmyWMfWrESOTa9dHcxQfn+Nd8xz1GFH6fJ9QWxv dcyg== 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=8K8dNHvtS/DTDX2OgSrfjzOHJKj+ivECHsaC8ySzJ1Y=; fh=9JCOumVf9dngCFHiV6Hmkcm2vnKQxEc42icPYm2blNQ=; b=lNoPdwo6jxDDX6O4yVE7uzlghFGI0gm4gczJOAV6NsVe7N98pWQ4XaRYYPCg0llSja sn8NEyGY9kGM5ir7rfyribziRmapUgJZ3UNLXD4pN0f+DSw404eFvQzmKdCo736tz2ps dyAXlKhyjNiWiHqdFX0D9H5H8o/hi2kNTvQg7NUeWwrzko57DcpBkyrVepzDcdYHs0nU bOEMtQYYBw8q7AHq+sChCiJFkO2nxIXv8KEVp9rV5Z9KygfAxPDQmdXIbMJWtf0q+mm+ E4UKKyVS3MIa1zpHvLrBY0nWxfwiqAp0QsoD8gBXJ7juQBWGXadlSiYq1U6pHCxSiQB+ YK0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="l9Etg7D/"; 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 c15-20020a170906528f00b00988c64dd2e7si1865818ejm.850.2023.06.25.09.46.50; Sun, 25 Jun 2023 09:47:14 -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="l9Etg7D/"; 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 S231770AbjFYQaf (ORCPT + 99 others); Sun, 25 Jun 2023 12:30:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231636AbjFYQ3t (ORCPT ); Sun, 25 Jun 2023 12:29:49 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 578C51BE7 for ; Sun, 25 Jun 2023 09:29:35 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-98de21518fbso186042166b.0 for ; Sun, 25 Jun 2023 09:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687710548; x=1690302548; 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=8K8dNHvtS/DTDX2OgSrfjzOHJKj+ivECHsaC8ySzJ1Y=; b=l9Etg7D/dnyPtCP+Q3k3y67exIgG/tfBKLuFrycYH02Qv701cS6TRyDae4EkZ7Ehp4 s3JL0S0IQVFnlkudFGsDU/zg36s6UY4K8DsmDOUTU7aw9STCIGUwQ2wurXyEKHRDS9Ls TH5r+Nh/QRQYLdWYogviHJ4Xpu+F6ghcz78PIvjvirXBVgbphWXZzzaEa65wF17AFvTy D3vZg68IQ0G9vONRmSrD9FKviLo/oxuYjyWCt2vZ++QUKt6Q7jwywcQ74no9qr/4mgPw 7MryAVtLEkybtQHhCAQBMFy1VRB/UNqAQn4Y4m/cSb2mDbAWVOrD7YIE1XDdQ9RhHPAv hzZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687710548; x=1690302548; 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=8K8dNHvtS/DTDX2OgSrfjzOHJKj+ivECHsaC8ySzJ1Y=; b=f/VFLIpH5E9YOIG0jm+4BNfRZCZ2VROM4ofpXR4d6OyuJskPqyzc2HO/Lw2KXNIRP2 9dZM+dFbrjLIe9PeGSkktyvnMgsscJeOQfODcAJz6LV3ozYKUQevUeaaoy+l24dyWGvV g3gWnpg6FeMGcwC+qhRmjS14IDeQ+GbRhLZy0wH4KrMtxOxkNXhzmNgEIUDqM1wYFLri yRgHYwT7NeS1UiZ8A3MUCgWxylASE3NMhjDG6+xeIZ3UqW8Q0PbxVJeR84dGKVydzSjh t3jp7c4pcL6oRx6R/kZaxwQRYJAcYwYE0ALpTkUxYVSekXoiMuqTiWW0+OgIAnqrYmKC ZGUw== X-Gm-Message-State: AC+VfDz9E+WsIj4DI36wdZ8Xbk6IhBb6P9LKlpiY1seNJSivXwZZyWJd ov9f0mRYzfmMz3QMPJTXIT7gIw== X-Received: by 2002:a17:906:ee8b:b0:974:c32c:b485 with SMTP id wt11-20020a170906ee8b00b00974c32cb485mr22659980ejb.45.1687710548393; Sun, 25 Jun 2023 09:29:08 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id ec10-20020a170906b6ca00b00982be08a9besm2277731ejb.172.2023.06.25.09.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:29:08 -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 24/24] Input: bu21029_ts - Use local 'client->dev' variable in probe() Date: Sun, 25 Jun 2023 18:28:17 +0200 Message-Id: <20230625162817.100397-25-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=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?1769693914670300324?= X-GMAIL-MSGID: =?utf-8?q?1769693914670300324?= 'dev' is shorter and simpler than '&client->dev' and in few cases it allows to skip line wrapping. Probe function uses '&client->dev' a lot, so this improves readability slightly. Suggested-by: Andy Shevchenko Signed-off-by: Krzysztof Kozlowski Reviewed-by: Andy Shevchenko --- Changes since v2: 1. New patch --- drivers/input/touchscreen/bu21029_ts.c | 35 +++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/input/touchscreen/bu21029_ts.c b/drivers/input/touchscreen/bu21029_ts.c index 3d81ebe66b66..e1dfbd92ab64 100644 --- a/drivers/input/touchscreen/bu21029_ts.c +++ b/drivers/input/touchscreen/bu21029_ts.c @@ -333,6 +333,7 @@ static void bu21029_stop_chip(struct input_dev *dev) static int bu21029_probe(struct i2c_client *client) { + struct device *dev = &client->dev; struct bu21029_ts_data *bu21029; struct input_dev *in_dev; int error; @@ -341,37 +342,33 @@ static int bu21029_probe(struct i2c_client *client) I2C_FUNC_SMBUS_WRITE_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA | I2C_FUNC_SMBUS_READ_I2C_BLOCK)) { - dev_err(&client->dev, - "i2c functionality support is not sufficient\n"); + dev_err(dev, "i2c functionality support is not sufficient\n"); return -EIO; } - bu21029 = devm_kzalloc(&client->dev, sizeof(*bu21029), GFP_KERNEL); + bu21029 = devm_kzalloc(dev, sizeof(*bu21029), GFP_KERNEL); if (!bu21029) return -ENOMEM; - error = device_property_read_u32(&client->dev, "rohm,x-plate-ohms", - &bu21029->x_plate_ohms); + error = device_property_read_u32(dev, "rohm,x-plate-ohms", &bu21029->x_plate_ohms); if (error) { - dev_err(&client->dev, - "invalid 'x-plate-ohms' supplied: %d\n", error); + dev_err(dev, "invalid 'x-plate-ohms' supplied: %d\n", error); return error; } - bu21029->vdd = devm_regulator_get(&client->dev, "vdd"); + bu21029->vdd = devm_regulator_get(dev, "vdd"); if (IS_ERR(bu21029->vdd)) - return dev_err_probe(&client->dev, PTR_ERR(bu21029->vdd), + return dev_err_probe(dev, PTR_ERR(bu21029->vdd), "failed to acquire 'vdd' supply\n"); - bu21029->reset_gpios = devm_gpiod_get_optional(&client->dev, - "reset", GPIOD_OUT_HIGH); + bu21029->reset_gpios = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(bu21029->reset_gpios)) - return dev_err_probe(&client->dev, PTR_ERR(bu21029->reset_gpios), + return dev_err_probe(dev, PTR_ERR(bu21029->reset_gpios), "failed to acquire 'reset' gpio\n"); - in_dev = devm_input_allocate_device(&client->dev); + in_dev = devm_input_allocate_device(dev); if (!in_dev) { - dev_err(&client->dev, "unable to allocate input device\n"); + dev_err(dev, "unable to allocate input device\n"); return -ENOMEM; } @@ -392,20 +389,18 @@ static int bu21029_probe(struct i2c_client *client) input_set_drvdata(in_dev, bu21029); - error = devm_request_threaded_irq(&client->dev, client->irq, - NULL, bu21029_touch_soft_irq, + error = devm_request_threaded_irq(dev, client->irq, NULL, + bu21029_touch_soft_irq, IRQF_ONESHOT | IRQF_NO_AUTOEN, DRIVER_NAME, bu21029); if (error) { - dev_err(&client->dev, - "unable to request touch irq: %d\n", error); + dev_err(dev, "unable to request touch irq: %d\n", error); return error; } error = input_register_device(in_dev); if (error) { - dev_err(&client->dev, - "unable to register input device: %d\n", error); + dev_err(dev, "unable to register input device: %d\n", error); return error; }