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);