From patchwork Mon Jan 2 11:41:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 38099 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4122542wrt; Mon, 2 Jan 2023 03:44:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXtWDKUneyixjOCfAaRa9+6OBNMRibCqbxFz9bkY2GxAKKvofsWd4LwuydHH7mIELBEVgcq4 X-Received: by 2002:a05:6a20:43a5:b0:af:6d40:9883 with SMTP id i37-20020a056a2043a500b000af6d409883mr53248921pzl.18.1672659859569; Mon, 02 Jan 2023 03:44:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672659859; cv=none; d=google.com; s=arc-20160816; b=ccgBqdIoE1PbqNSFmTkZY8veu5ZPD/GywXrwHA6H3vxzsQi+tL9hhoxYAfoTtcCxky zvYo6zdPv6QO4sJ9Hvmtoo0j3unMMgSNn/wNOOUh3Pk3XXklQrWUbCt/7gYJ7wk0+NV0 sLEuN2f0lSAZF4I/o0K9iMSpCAj31/j0dp+qlUUfFTADnF/0IW55kTVJ8U0D7Itdf+zT WKZGfjS72+XUM8Vwq+WAJ+zZ6gjnbx9AA1ihlECMEcrh/VKl4VsrZcm+q1z0M6/Ld9E3 bR99zcCcT//tB1M1etOpB/xJ/lWmeuQFu3ISdqSdChekfv6sHO4+PEh7aI1uYl22bGOr TDxw== 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=d3ISjc0HqFZLXSFtXhlmeBjb8PLOBicDWq3ocAujh1c=; b=tyVo/RopxKyUe64pGqb3rqgNWM7KnixC7DAkdXOnuuYuGF6eJ1+rK0/EgquF7PTcQX VxLSTSl9we7gmZ/2qeaewUuO0f47NppN1lfz/oBW5OlyZb+8LSqjkGueVSfOrWMMj+JW e9QQ1HUG/fE281/PCCmAHHwToQe+3IbXy585AHw3B8HtB8MPk+h/0QS4Yn2/OQvIQ6i4 /0uUxaWs2JGzIQykRIJ+y3VdMPnEe97R+5wqXDu+grVLZ4k9ZNk3AIagbfupq88LJkOE 5Op6CzwxV+tMer7V9zu6n1tCo5eexjCRPDWckyiBPmOye+TVslzwQN0n058iNoPHGKF4 58rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GK4P+qO5; 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 d31-20020a630e1f000000b00479018afb14si29641669pgl.49.2023.01.02.03.44.07; Mon, 02 Jan 2023 03:44:19 -0800 (PST) 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=GK4P+qO5; 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 S232889AbjABLmY (ORCPT + 99 others); Mon, 2 Jan 2023 06:42:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232792AbjABLmC (ORCPT ); Mon, 2 Jan 2023 06:42:02 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42443F14 for ; Mon, 2 Jan 2023 03:42:01 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id bp15so41232257lfb.13 for ; Mon, 02 Jan 2023 03:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=d3ISjc0HqFZLXSFtXhlmeBjb8PLOBicDWq3ocAujh1c=; b=GK4P+qO5a7tUHbIu3KBEzJQf+LXCryVD3sQnn0/7NhmYDIr3J7AYo+OB/fW8fZRrBg aA7rscY8x7m82EAsVDetQNaiAXOuNr+95LtYickbCC2H/l1964yv+w+s32rhWGfywqcJ 0vtSPyK9cxBxBJd972wcNTeNZZ11+frK8GIHZ4HgeDMWkyQwLJieUypa9+gXiOLZC2wZ Rj4Pdeh8UUaYaF5msURa97gdfPBDbM0VVBi1r1FEydq+7V7Rqrd78iPbDyF+uzDP1mfu dvqc7v539aBZBsQxIkEuFKfT+F0WYZdn4VHA7b94NHfrpAuebipeb+h+RwMjqOP6v4Yz VJeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=d3ISjc0HqFZLXSFtXhlmeBjb8PLOBicDWq3ocAujh1c=; b=kxQi+P3XKNUUltRPyEjKQiKaZ6thl0PEPEy6wBcuuvq8e0xvYC3ifsOuvvYwJx5bGp HuOtIcTVzbkboXv7spCSWQA33yw9He5c16TMnSXSYPhQP1GrlVn3Ule9HZMLzKWMT/4E xKWTFja4wqnl+7RLoYGKwO/xq1UmKrKvguTtxcxK1JUXwVewvhxeKv/nYr9D4c/UWuv8 7Dt8fv8t02duYCzJgDQI+KUFVFFeqblvET88iw1s0m3xwtlshApHV4gIfn9pF/bBUU/6 HEAqkGkRj0oeOfkgwZiJEIb62oRnjpHWDj3DSPJ5LQ4l2FZie8zX1/vCYeLpDQqMwGcx YtwQ== X-Gm-Message-State: AFqh2kosj3LqZKnfY5OGQbVeD1Nbbn464tJzWdJhOXIj+L/dUUuvz3qV Bay9iI15rcw5v67CND6gxms52Q== X-Received: by 2002:a05:6512:4005:b0:4b5:9183:5ad0 with SMTP id br5-20020a056512400500b004b591835ad0mr14368017lfb.63.1672659719657; Mon, 02 Jan 2023 03:41:59 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id c20-20020ac24154000000b0048a8c907fe9sm4356397lfi.167.2023.01.02.03.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jan 2023 03:41:59 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/8] ASoC: codecs: wsa881x: Simplify with dev_err_probe Date: Mon, 2 Jan 2023 12:41:47 +0100 Message-Id: <20230102114152.297305-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230102114152.297305-1-krzysztof.kozlowski@linaro.org> References: <20230102114152.297305-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 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?1753910984802647367?= X-GMAIL-MSGID: =?utf-8?q?1753910984802647367?= Code can be a bit simpler with dev_err_probe(). Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wsa881x.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c index cd7be55f6a89..6df9c48f42bf 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -1119,10 +1119,9 @@ static int wsa881x_probe(struct sdw_slave *pdev, wsa881x->sd_n = devm_gpiod_get_optional(dev, "powerdown", GPIOD_FLAGS_BIT_NONEXCLUSIVE); - if (IS_ERR(wsa881x->sd_n)) { - dev_err(&pdev->dev, "Shutdown Control GPIO not found\n"); - return PTR_ERR(wsa881x->sd_n); - } + if (IS_ERR(wsa881x->sd_n)) + return dev_err_probe(dev, PTR_ERR(wsa881x->sd_n), + "Shutdown Control GPIO not found\n"); dev_set_drvdata(dev, wsa881x); wsa881x->slave = pdev; @@ -1138,10 +1137,8 @@ static int wsa881x_probe(struct sdw_slave *pdev, gpiod_direction_output(wsa881x->sd_n, 1); wsa881x->regmap = devm_regmap_init_sdw(pdev, &wsa881x_regmap_config); - if (IS_ERR(wsa881x->regmap)) { - dev_err(&pdev->dev, "regmap_init failed\n"); - return PTR_ERR(wsa881x->regmap); - } + if (IS_ERR(wsa881x->regmap)) + return dev_err_probe(dev, PTR_ERR(wsa881x->regmap), "regmap_init failed\n"); pm_runtime_set_autosuspend_delay(dev, 3000); pm_runtime_use_autosuspend(dev);