From patchwork Mon Apr 17 14:14:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84267 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2093483rwl; Mon, 17 Apr 2023 07:22:32 -0700 (PDT) X-Google-Smtp-Source: AKy350bhpInpd5K8faFzaW+Bz5v2udqNtYTd2mNzDma5/r1ozWE9oJfmp76OYEw6HxtqdRDgzpTs X-Received: by 2002:a17:902:d48e:b0:19e:ab29:1ec2 with SMTP id c14-20020a170902d48e00b0019eab291ec2mr15437274plg.65.1681741352486; Mon, 17 Apr 2023 07:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681741352; cv=none; d=google.com; s=arc-20160816; b=ZAQ5eFv4lrAwmH3Kl6wpADid/q5tiAClF/BEEhGkwynVg15JKDtkZMbwC9GtiSoFOH OaYxkPB5Z2J2/BcdGhBppHZjI0px5pKZg/p7DFSk3KuysCq6DSXqDyFqV211Ru6jeIdt TPdJ2k5fnQV9NjDK5N1d0J9QSZ32FrJ0cDHuWl49wyl1II57ENFMpDyPzyHzqRokzcM+ y57imJrMCoOCQSP3xqrb6fQUGnYfJ7DKkvkfQvpsPoWLK/bUAupkkzhKyVN6Ke6eBOqU KKGBJ76fz/gpe7YTyTPxZrfdN1PEACbAdvEey+qq8j7EZGJbG2xSYnzlQk4v8fiwn73+ /+Kg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=l8OjZCSSC//phSuWYvfawiHJ89Dsp2AaxdfcVlgHVfA=; b=fI99+9qh61m1/fWiIWGRHbWP/Iht1kneCG6SkS05nzFs5fx9+Erypij3QAkKyYSVO6 M3Cur7jBCuaa/ceUPTaH7M3nvWK/8GWPodTwPEq163xnip8GUhgCkkY5kKtH0p83a8Ij ObwFeiuO0xFcyQtY+JNkcyWfXYXRhsjuq2kOJvwVKRtk23T0teYE9vmVaKt5rRC3lfll YqHGWZI01kW3vf9+2tk0jCFrXGXIhoaO146PUTVzMPUJJk6AjOl4YX47HXNoK7DwR0JZ thwcArsFvijpKI6TpBqw/ZIfODsG6kHwrTUp++feYUrJN+Y0T2wAP+7qmH6SYGkEnzUo Knwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="w/93HIzA"; 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 h1-20020a170902b94100b0019e6185116esi10987237pls.274.2023.04.17.07.22.16; Mon, 17 Apr 2023 07:22:32 -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="w/93HIzA"; 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 S230232AbjDQOPE (ORCPT + 99 others); Mon, 17 Apr 2023 10:15:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230253AbjDQOPA (ORCPT ); Mon, 17 Apr 2023 10:15:00 -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 80B985267 for ; Mon, 17 Apr 2023 07:14:57 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id c9so25671789ejz.1 for ; Mon, 17 Apr 2023 07:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681740896; x=1684332896; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=l8OjZCSSC//phSuWYvfawiHJ89Dsp2AaxdfcVlgHVfA=; b=w/93HIzAuP5t6l+IMz0tDo3YXGzXWUJfwpErdrbZ2jkDH3nOltQcKZOYn6MZ1Ylvl1 YLolZ3KjnWSSIntWx1g4yDPgdjiqT6I2zzmCX5KJQaQXaq7L1KeNKa/3w2mWAegaasjt GWU8XrzdE0Pru49Zd1WhwPo+2oynrKKVG5jGGjYX7k30SB0aWL2mm0mc/6absdit0rpU BBAP1E3hWtowRNEii0j1CYtHHW29bvRE0778vJ/k0HYCuNJqW5M39iKouODl141uyHqW 6pLzU7eyxgPEr7q/m3ltm80htp1o9qRxVwIM7gIQTCZ35T61WGr6juhm5kInRcEn1L7g Lr1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681740896; x=1684332896; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=l8OjZCSSC//phSuWYvfawiHJ89Dsp2AaxdfcVlgHVfA=; b=ghRhpi53pZ7PHmnSKl4Gro8bOoITPto44HlPo2A4W9H2Yrjn7yscHbKolyPfb6eURK e/HIS3nXp0TK1UZQTes7yhvY83tgKpbjktTCMdHeIe3qrHdsdLqowQGLBEjtJE9+K9cX s0dUuQZXj6NfIkIV3gi5tByWHZarVb0R5UKPhIOt0n/4nA8ZNaRGod1c6+Womqci8c8l WjX+8mkTMeEVNoqGbI5hYF6oTKW83/qHSTVJbCGcqjKuUXL0Se3gyIiWx7PLS7u3Wwxl 3+yVoTJSIVW+kcyEFdbPdjmPSS0IUmzC4r4s9FB6Y8W4gO3SDa4dXdKqELSofVuAWa+S t4jA== X-Gm-Message-State: AAQBX9dUhff9rAMrfpwQWg6NC0e3m4xrSp82dXPRJP5+dilNdQAsXmeT Q94u1gGwhyRlXt4g+oSANX+PjA== X-Received: by 2002:a17:907:7e9c:b0:94f:335b:4da0 with SMTP id qb28-20020a1709077e9c00b0094f335b4da0mr6563124ejc.51.1681740895939; Mon, 17 Apr 2023 07:14:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:14:55 -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 1/4] ASoC: codecs: wcd9335: Simplify with dev_err_probe Date: Mon, 17 Apr 2023 16:14:50 +0200 Message-Id: <20230417141453.919158-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 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?1763433620777794718?= X-GMAIL-MSGID: =?utf-8?q?1763433620777794718?= Code can be a bit simpler with dev_err_probe(). Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd9335.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index d2548fdf9ae5..8bf3510a3ea3 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -5138,20 +5138,17 @@ static int wcd9335_irq_init(struct wcd9335_codec *wcd) * INTR2 is a subset of first interrupt sources MAD, VBAT, and SVA */ wcd->intr1 = of_irq_get_byname(wcd->dev->of_node, "intr1"); - if (wcd->intr1 < 0) { - if (wcd->intr1 != -EPROBE_DEFER) - dev_err(wcd->dev, "Unable to configure IRQ\n"); - - return wcd->intr1; - } + if (wcd->intr1 < 0) + return dev_err_probe(wcd->dev, wcd->intr1, + "Unable to configure IRQ\n"); ret = devm_regmap_add_irq_chip(wcd->dev, wcd->regmap, wcd->intr1, IRQF_TRIGGER_HIGH, 0, &wcd9335_regmap_irq1_chip, &wcd->irq_data); if (ret) - dev_err(wcd->dev, "Failed to register IRQ chip: %d\n", ret); + return dev_err_probe(wcd->dev, ret, "Failed to register IRQ chip\n"); - return ret; + return 0; } static int wcd9335_slim_probe(struct slim_device *slim) @@ -5207,17 +5204,15 @@ static int wcd9335_slim_status(struct slim_device *sdev, slim_get_logical_addr(wcd->slim_ifc_dev); wcd->regmap = regmap_init_slimbus(sdev, &wcd9335_regmap_config); - if (IS_ERR(wcd->regmap)) { - dev_err(dev, "Failed to allocate slim register map\n"); - return PTR_ERR(wcd->regmap); - } + if (IS_ERR(wcd->regmap)) + return dev_err_probe(dev, PTR_ERR(wcd->regmap), + "Failed to allocate slim register map\n"); wcd->if_regmap = regmap_init_slimbus(wcd->slim_ifc_dev, &wcd9335_ifc_regmap_config); - if (IS_ERR(wcd->if_regmap)) { - dev_err(dev, "Failed to allocate ifc register map\n"); - return PTR_ERR(wcd->if_regmap); - } + if (IS_ERR(wcd->if_regmap)) + return dev_err_probe(dev, PTR_ERR(wcd->if_regmap), + "Failed to allocate ifc register map\n"); ret = wcd9335_bring_up(wcd); if (ret) { From patchwork Mon Apr 17 14:14:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84265 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2093450rwl; Mon, 17 Apr 2023 07:22:29 -0700 (PDT) X-Google-Smtp-Source: AKy350YkPvlECRyAsZjOCTRxZJda2HSFErX426zuayxZOFYSib7Q5lCWfUdhg7t5UxCPOGPEFQGB X-Received: by 2002:a17:902:f94b:b0:1a2:9051:f09e with SMTP id kx11-20020a170902f94b00b001a29051f09emr10920539plb.21.1681741349129; Mon, 17 Apr 2023 07:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681741349; cv=none; d=google.com; s=arc-20160816; b=RsUn0m0ycHl9IWjDZKNR0U5fZDhiy6G7PBM+5cBxiryRNP8VYXiMzOyvf9B38j74sD Fit6Tgbj1PRU7tpafXMHIYErEpntXSBwYWOE0c+cJmwtxj5dr+Q3NliNxE1veld+ATmc PmNY/XFg+bndnYXmT/G0U7hBjIeZ0cnFyRxAWQm57P6l8WhGn4x9FrATebui0f3T6JOo 5Y+R+dnq+wnLAPkj05NOoaZP0b+/kQbYPkYnk+EClz0gJI1SfXLMqhFpPF7IZzhFu/9A LzJBG8ZgHz0FFv0T0zeTYMh7zAGstmUnkCMt0bdGLfeab7AFSjixV20UD2eJUiJl2Nr4 OTUw== 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=DdSLfFTkv6LYV3M0mzyuGaPRuWS7s/5vp6QK5VHSwvw=; b=ZtBQm0Iz861L4NffTCGJnKWO2ebW1YnRWbj2QRCm9F4Kn+P4LFnGQYD3Hzsnsji0EL iwDkwdM73G0A9Dvq9tc+lPetiPopqwok3xeZCn7239wpttSUxqL09DH+9JEvoQtuYtF7 h3Q6TlJlWAU5M9TjD4ytwKgL060wg7uwGXhs14Sti/KrKXXY/45V6x3ish3qCoJ+0U7o rX0vSwtxiF4XDhcwKhQTeBOFvZdUqxRdJcGFVmss1u+u85H7+jGuJMLxHq0yej1mxWQy ae43x/xf3gNn1jhaJZXhhKtXaStCjPHSQFe6QjvZX93cHVZBCRU+U0LPd5lkCj5w4bAL YVHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RzE+hWQv; 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 u6-20020a17090282c600b001a4fc13dfa5si11679239plz.276.2023.04.17.07.22.13; Mon, 17 Apr 2023 07:22:29 -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=RzE+hWQv; 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 S231217AbjDQOPC (ORCPT + 99 others); Mon, 17 Apr 2023 10:15:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbjDQOPA (ORCPT ); Mon, 17 Apr 2023 10:15:00 -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 CB0625580 for ; Mon, 17 Apr 2023 07:14:58 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-50672fbf83eso14693688a12.0 for ; Mon, 17 Apr 2023 07:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681740897; x=1684332897; 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=DdSLfFTkv6LYV3M0mzyuGaPRuWS7s/5vp6QK5VHSwvw=; b=RzE+hWQvLG+ToUxcaDtEz9Q3e8NAYpfR7V5FIpzDQuomR5owNFdDhUvH2QaJipF10D GWjQqAHBtrZGC615Ls7NgtT+6C4C1jOjVw0B7hMOEY3u/fUyHuT3t4TsOAkAKWsVI1h4 AEfglOWetOIog4xZls6MOZJkql6492Ni2Zw4EoF5Qo+zrz5dJPENj1jeJIRTF9U1khZ6 fn936x3xvUrAzwgWBXafJCWCBWUufiAkTrw9X8JlPtynRTseumDspzinwkfJVPxg/qgG ZZ4hsxxTHKzvHpblKwulKigeP7Nw7tZNwiWpKpZlNnxIC1QrXUS+vvo4QSm+yRiHh8Qc zanA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681740897; x=1684332897; 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=DdSLfFTkv6LYV3M0mzyuGaPRuWS7s/5vp6QK5VHSwvw=; b=B5/viSX84/tk7bbED0bG+mxUYqxk1xhb8EJJIdcQBXB566UI59WsyZzRjAJWdWTPeL FZKmpeNkyiJ/tqBRQnEeDu0a0dIWv9dnSWoSblKOVjmPvCjlvDMa82LflPHFKw8Aipkk seQmlmHk4NDB8JNi29KEsUm2yoZWmJ8GA9wWj2o6kerXNFroqEAsOpBOOL68Q7UZ5+VG LTqhvfVwS++UOOXV4cro2E8nKFiNCH8t1H3nVBEs3+dB6rP/9NT7ciTprUgxpn9HDi8l w6ekVp6idX+PJGpFriMAc3pNncI91kRf/r/tzdkXocZh2M95n9eD6QjBs13Hvk9l6fiK 32fQ== X-Gm-Message-State: AAQBX9ekS0XVwT57FiHIzRJsg4DaHxUvUqgg+JUMQdRqttNkdmOELu0t db34zjshQhj9rI2FtwCYN+2iDw== X-Received: by 2002:a05:6402:4cb:b0:504:9350:f458 with SMTP id n11-20020a05640204cb00b005049350f458mr13585489edw.1.1681740897195; Mon, 17 Apr 2023 07:14:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:14:56 -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 2/4] ASoC: codecs: wcd934x: Simplify with dev_err_probe Date: Mon, 17 Apr 2023 16:14:51 +0200 Message-Id: <20230417141453.919158-2-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?1763433616747767030?= X-GMAIL-MSGID: =?utf-8?q?1763433616747767030?= Code can be a bit simpler with dev_err_probe(). Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd934x.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index 783479a4d535..56487ad2f048 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -5868,10 +5868,9 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd) slim_get_logical_addr(wcd->sidev); wcd->if_regmap = regmap_init_slimbus(wcd->sidev, &wcd934x_ifc_regmap_config); - if (IS_ERR(wcd->if_regmap)) { - dev_err(dev, "Failed to allocate ifc register map\n"); - return PTR_ERR(wcd->if_regmap); - } + if (IS_ERR(wcd->if_regmap)) + return dev_err_probe(dev, PTR_ERR(wcd->if_regmap), + "Failed to allocate ifc register map\n"); of_property_read_u32(dev->parent->of_node, "qcom,dmic-sample-rate", &wcd->dmic_sample_rate); @@ -5923,19 +5922,15 @@ static int wcd934x_codec_probe(struct platform_device *pdev) memcpy(wcd->tx_chs, wcd934x_tx_chs, sizeof(wcd934x_tx_chs)); irq = regmap_irq_get_virq(data->irq_data, WCD934X_IRQ_SLIMBUS); - if (irq < 0) { - dev_err(wcd->dev, "Failed to get SLIM IRQ\n"); - return irq; - } + if (irq < 0) + return dev_err_probe(wcd->dev, irq, "Failed to get SLIM IRQ\n"); ret = devm_request_threaded_irq(dev, irq, NULL, wcd934x_slim_irq_handler, IRQF_TRIGGER_RISING | IRQF_ONESHOT, "slim", wcd); - if (ret) { - dev_err(dev, "Failed to request slimbus irq\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to request slimbus irq\n"); wcd934x_register_mclk_output(wcd); platform_set_drvdata(pdev, wcd); From patchwork Mon Apr 17 14:14:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84266 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2093476rwl; Mon, 17 Apr 2023 07:22:31 -0700 (PDT) X-Google-Smtp-Source: AKy350b1zoyQ1w1DjZOkOD05tiArfoYULy50xkdB1lM3K/842fTIykoojcWZTQulyZCV4J1qD/jW X-Received: by 2002:a05:6808:4386:b0:38b:a798:7b8b with SMTP id dz6-20020a056808438600b0038ba7987b8bmr6963173oib.6.1681741351553; Mon, 17 Apr 2023 07:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681741351; cv=none; d=google.com; s=arc-20160816; b=V6kbUyiDaBqXKKrU6zBrZ+nhPbv6zM7F57bT2xm/LxGtvldpmrimFxum98SRfUkxG1 S3dZV5diiYNrNR7f2ttyFSuzDdmY1APW9BeXoLhx0IZTbZWiHnY+3O+RuPmCDqo7AB3p zQTb7myCptOuEATyOhhumSHzw67f8M586Yzitu+pIulh5hVgo4g/bmJw86WPD7XdSSse TrUiVsX9jZfOdsQt9ImoVgzntO80TYS3kEHHxuma+EcnU2vJNtK75mLxbj0vBM9lpzOP M/toDChpW4PZqaKEtJj5HsVo0ial40zDpSaO4a2qfE6K0LRhMkFyMGkhYmjdkfx4b+ht mWow== 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=QQmIdP3RJKa4pxnl8xRRCwok/HaLYslpm8yDZiO67M8=; b=RHDYmwQ174CgNuqXGf975buG3HGMT1fuxiqd3BJtxIpYqbz+QMyOUg8y8lWJSSbEuy YveAMR6jbmZrF7OkpdQr1ajnGAZSpSACdlNhieIh2lG47K2Q/S1dKmBpl6Ek88aXIIh1 zXtVQLpsUsN3kQbiQzQOmCyjCfUzKTft8ENtFiag0ZbnaAZztMlBUrBwfD+dfFfHNc1O LM7hEpSlnIFRQMzWqOxg51XCWWiyonCI01gprAk4xqGK6m4Wd+4OTEacvdCnpR68tB33 GR/P60jM6+SLglJF2qkzYIZ+WMwtpPk3YRbn4//krdIYDoVLjomiPQClHG2ZJTtZ/3VR JSZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YATFDIf1; 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 v7-20020acade07000000b0038de987c378si4141253oig.129.2023.04.17.07.22.17; Mon, 17 Apr 2023 07:22:31 -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=YATFDIf1; 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 S230248AbjDQOPK (ORCPT + 99 others); Mon, 17 Apr 2023 10:15:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231213AbjDQOPB (ORCPT ); Mon, 17 Apr 2023 10:15:01 -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 58092525D for ; Mon, 17 Apr 2023 07:15:00 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-94eff00bcdaso181011666b.1 for ; Mon, 17 Apr 2023 07:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681740899; x=1684332899; 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=QQmIdP3RJKa4pxnl8xRRCwok/HaLYslpm8yDZiO67M8=; b=YATFDIf1tAx0aaKR/kVjChTDSUWOUhhDgFiTENafwW1rgezl7ILWfZWDw7oLDEc87Z WAeF8koTDqiRrZERt0r5ffbpmiST9jLq98jNACPzcNl8xc9i1n6uTg9yHpYkniMzqqOb aD+QzPlJ8NBVDHP02Frk2E6BEEKg2xV+qMvhMbWghNmVHZyfRwU4g23CMLjuDATcepUT oOLNzDjPSi0ISjl6KGii894jUlFkCB/i10NRV2OYEUh90uc7zKQb+cGedzuwuJ9ExXrj dlFdJzyayYN8rsX0TE55PsClsyyjgAHlMZx98V9EM2F2IC6D4G5Su4RsT0QStuq0wxfI WGgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681740899; x=1684332899; 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=QQmIdP3RJKa4pxnl8xRRCwok/HaLYslpm8yDZiO67M8=; b=GoWPWW0sgO3lmwykQJ3JESmto3r0w+x0XZFhJ8X0f9rkxyA0ST4hmR0vkBOnqLRyBv y2tNUZKuSQdexTl1IKchz8ztVBAiNqzHhS6gOXS8kyNKgug0Cm5yikjg1dFyp1Fk99PB d4nrjm92xCAMTZi3KVnlRU4Pm/E4SNaIePiD0fjm/bF+1D1OgulG0ELVdHpr6FomlTdf 97CX05xdN54lsuK3dE47kU/JL2zbOdNTwxs9VzUJXJ9tzgv8hQNVsk24zFTeGeNRVv9Q F6jplO4F+kOYAWPJTBtiAZ6FGwiInhdOAJi/tGStFHwd5Y1js7PMASbumcaZ17mq6bPd dTTg== X-Gm-Message-State: AAQBX9devOqQcl3ukGPqd8jtQ0ULtKcGsXI2DOAfbyAP6GSy++aS3cqJ YPW0GPEbI5Bk0+k3T4MLoCwJrA== X-Received: by 2002:aa7:c90b:0:b0:506:7385:9653 with SMTP id b11-20020aa7c90b000000b0050673859653mr13444306edt.39.1681740898824; Mon, 17 Apr 2023 07:14:58 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:14:58 -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 3/4] ASoC: codecs: wcd934x: Simplify &pdev->dev in probe Date: Mon, 17 Apr 2023 16:14:52 +0200 Message-Id: <20230417141453.919158-3-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?1763433619667547837?= X-GMAIL-MSGID: =?utf-8?q?1763433619667547837?= The probe already stores pointer to &pdev->dev, so use it to make the code a bit easier to read. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd934x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index 56487ad2f048..c0d1fa36d841 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -5892,12 +5892,12 @@ static int wcd934x_codec_parse_data(struct wcd934x_codec *wcd) static int wcd934x_codec_probe(struct platform_device *pdev) { - struct wcd934x_ddata *data = dev_get_drvdata(pdev->dev.parent); - struct wcd934x_codec *wcd; struct device *dev = &pdev->dev; + struct wcd934x_ddata *data = dev_get_drvdata(dev->parent); + struct wcd934x_codec *wcd; int ret, irq; - wcd = devm_kzalloc(&pdev->dev, sizeof(*wcd), GFP_KERNEL); + wcd = devm_kzalloc(dev, sizeof(*wcd), GFP_KERNEL); if (!wcd) return -ENOMEM; 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);