From patchwork Mon Apr 17 14:14:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84269 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2093656rwl; Mon, 17 Apr 2023 07:22:47 -0700 (PDT) X-Google-Smtp-Source: AKy350YxLPW0hHyY8qG095hxeY706VH1cM0tGaf6iQVRYa5p3bM6aXGbW2rOxe5xfKqBN2roKdSd X-Received: by 2002:a05:6830:1050:b0:6a5:d98d:e950 with SMTP id b16-20020a056830105000b006a5d98de950mr2615095otp.35.1681741366774; Mon, 17 Apr 2023 07:22:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681741366; cv=none; d=google.com; s=arc-20160816; b=XDfZfx3CWtwPQEudcNSBCWy1uHeGEWw+sMLh7a/L1mJXtjH3lWYCjc//qk6atBdhrz pWKViRO01lQ6w6AgI6zK9k/55Iwq73iddYzWQHqmTFFObWlCPnxM4B9EQbdy17cDXfim AHB+wYZ9v/kdTvWz440DwlF9xxv/9qX2PknAt68blmun9aotugvc/BSsEr5wxRw/4e0U TlziGgFV5JQgdDj7wpJGTkFBgpcLsRqF8/+E0JebtyucTugIhWu+f7C6vIU9SSyc+7Ot ARF6W/eWVvQN/Tr6IUnL7Qh8WPeTm3WQCglB5GyexBCKmlBfZYS4GMT8EL/dpAvgSArc Urmw== 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=p+Gqwd50O978CgcnfFnllVcskvaI5UoRb9w8Mjh4Qt4=; b=xYypnCt32plPTGseYdG+volAdFyUoHbzag85qCv/tsAGxT2nP09RIQEKeXFDcTkG5Y zx/Vi6HrwWjTc2eBom2aDSsJ33OguwvnrwA4UEG5Ii+pcR6KUoZNADqBza65/dfzcGYe PcDRtZNFWGIhl/MblWsq9t5rZmdt42PwcTC1dspZUNXfTnDBReZS/oQITOPM13Do2+a2 /Vtui7krqI86oWEQmyBh0qbgG3lU/mAFXJCPn0j92v6IzDWFivb/FBSxn8YYTj4I2YZc NPXbK31/ii6GOz0ZSpDt+XBwN8iejoaj9nXsjr3Bji11U8JObGUPV22rOEnD7MicsUUv eEsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NhvozIn9; 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 j14-20020a056830014e00b0068be3740c37si9600612otp.41.2023.04.17.07.22.32; Mon, 17 Apr 2023 07:22:46 -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=NhvozIn9; 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 S231241AbjDQOPN (ORCPT + 99 others); Mon, 17 Apr 2023 10:15:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231220AbjDQOPD (ORCPT ); Mon, 17 Apr 2023 10:15:03 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90DEF4C17 for ; Mon, 17 Apr 2023 07:15:01 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-504eac2f0b2so4682326a12.3 for ; Mon, 17 Apr 2023 07:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681740900; x=1684332900; 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=p+Gqwd50O978CgcnfFnllVcskvaI5UoRb9w8Mjh4Qt4=; b=NhvozIn9uNmaKOvuqJ4W3H9KLBsRVfD3pBTemHy3QP44mHjFSwo3ili22DRVQ4xWD2 OENCn9eEIw0SMkaOA13LqHh5rbD7i+R0pxasR8Gto4yvtRxOdNYS7CT9T+lpWTPEMvxY 5vZG9kd5Y3MhRasLTy+paVpBOWBMGe5Pf3CfaRG+XzYCvPfK+5c9FJoRbLQO7SeMJJWU VLK9DT7gjljEdPIhzFuQM8YbEIbjSUFqIumrHJ1BNFpzaQwx/uDRfN2SRMAy0u+JGZ2H D2z63Fdwi7Ef0StiEurf7clLKLKs5Yrzesf6m6AXNmVp10RwfIZh62BWxFtp70qdHlOw 6soQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681740900; x=1684332900; 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=p+Gqwd50O978CgcnfFnllVcskvaI5UoRb9w8Mjh4Qt4=; b=kBXpb3pYLa7Fcw+nV3ga+Vl27bRqBHP431DmeOP3ROQAzIOZhjVpq6FSSaAiyJIF8H NZ2qNMFJftBl2wt1ggYgRdkqJ/PKdTsksrp70hh0qspTTinfP8liIYNa329UR0Zx6qB5 QCVf3xAmxBqgrVvnDnySEqpKh0TnLdS611LLkx+w8qJimLXodAirY3wOtKLZS4raH6Wo MN9HOuqJ2Ew7c6mOVZ/nnw5Y7Inbcu7lmhCX4A9FrmflJrmhfwLuU+OPSDe8AADqYCat ls4GYtGRZSTB1RGL6iV7yDfwSJcqO+njDjffHOm2LxQqp5SGC/RK/JBpMobrWYN3aRxf d0fw== X-Gm-Message-State: AAQBX9d9Pw2+pxTKlys49+2iyJwI2lZpdyB/krUK31UgD0uPX1lksoo4 vMr1fBcgryPnQ7oIOuqf6WOjYQ== X-Received: by 2002:aa7:c90b:0:b0:506:7385:9653 with SMTP id b11-20020aa7c90b000000b0050673859653mr13444365edt.39.1681740900005; Mon, 17 Apr 2023 07:15:00 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:96aa:60eb:e021:6511]) by smtp.gmail.com with ESMTPSA id q6-20020a056402040600b004f9e6495f94sm5832034edv.50.2023.04.17.07.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:14:59 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 4/4] ASoC: codecs: wcd938x: Simplify with dev_err_probe Date: Mon, 17 Apr 2023 16:14:53 +0200 Message-Id: <20230417141453.919158-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230417141453.919158-1-krzysztof.kozlowski@linaro.org> References: <20230417141453.919158-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?1763433634886956792?= X-GMAIL-MSGID: =?utf-8?q?1763433634886956792?= Code can be a bit simpler with dev_err_probe(). Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd938x.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index f033f79ed238..11b264a63b04 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -4235,18 +4235,15 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device int ret; wcd938x->reset_gpio = of_get_named_gpio(dev->of_node, "reset-gpios", 0); - if (wcd938x->reset_gpio < 0) { - dev_err(dev, "Failed to get reset gpio: err = %d\n", - wcd938x->reset_gpio); - return wcd938x->reset_gpio; - } + if (wcd938x->reset_gpio < 0) + return dev_err_probe(dev, wcd938x->reset_gpio, + "Failed to get reset gpio\n"); wcd938x->us_euro_gpio = devm_gpiod_get_optional(dev, "us-euro", GPIOD_OUT_LOW); - if (IS_ERR(wcd938x->us_euro_gpio)) { - dev_err(dev, "us-euro swap Control GPIO not found\n"); - return PTR_ERR(wcd938x->us_euro_gpio); - } + if (IS_ERR(wcd938x->us_euro_gpio)) + return dev_err_probe(dev, PTR_ERR(wcd938x->us_euro_gpio), + "us-euro swap Control GPIO not found\n"); cfg->swap_gnd_mic = wcd938x_swap_gnd_mic; @@ -4256,16 +4253,12 @@ static int wcd938x_populate_dt_data(struct wcd938x_priv *wcd938x, struct device wcd938x->supplies[3].supply = "vdd-mic-bias"; ret = regulator_bulk_get(dev, WCD938X_MAX_SUPPLY, wcd938x->supplies); - if (ret) { - dev_err(dev, "Failed to get supplies: err = %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to get supplies\n"); ret = regulator_bulk_enable(WCD938X_MAX_SUPPLY, wcd938x->supplies); - if (ret) { - dev_err(dev, "Failed to enable supplies: err = %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to enable supplies\n"); wcd938x_dt_parse_micbias_info(dev, wcd938x);