From patchwork Tue Apr 18 07:46:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2658521vqo; Tue, 18 Apr 2023 00:54:38 -0700 (PDT) X-Google-Smtp-Source: AKy350abv35c2PMjr6ed7fRGFwsAxWffL2HtRPs4CW4vf8WZhcVP0z/pJanllZ4eLABbhE0v7wvP X-Received: by 2002:a17:90b:4b02:b0:247:1c17:77eb with SMTP id lx2-20020a17090b4b0200b002471c1777ebmr1234081pjb.27.1681804478681; Tue, 18 Apr 2023 00:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681804478; cv=none; d=google.com; s=arc-20160816; b=q7689a6W40tnkHSellY9u5/GUtIkO6FwkgSJL1EtFaHAQKWisi5JuKjd7Odow4ScTE A1Bcz9X8/vUrDqjvut+xUgGdvQ4Wk76tioMf+cIL9KwddJ0BSvLPrVtDwDQzDIV27zt+ nfYUEQvrfcjWDVAFPCwxoKKkzrZgOTe7VH78g/WdMULoUSNMeoe1UgIO4C6FvIFEqQ4S EWXQxsp7E56VAK44K9CR4/q6ldmwncaZwI+oLscr09EPwEC/t5G3k5vQQvrLRXAzOlEF 0WNKc+ENjeELEc1g3wUG0U0ZXrkBF2+czN0ob+YF3avgIrvaMMPob47nJwfDNkeuKK/N w0Yw== 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=r75opw4l+CuhzHbMethMKplabYX6RCoTnwLJOAhIH2w=; b=VDXIyEpEv1pYbtcf9zmK//d1KD0fkpZi0vMknIpScnC5JHibccVDNXikSuCQudZPPg IVZAj4C0hxjGwuyVEgh8dl2TnVrrm9AvNWQZdgfG9FgQi0eKvqM3ZxBe1pSPsYYs+H7T /12rE8MdQ5UADvc1YiakMylXDlZNlsOMIKI/gSqLd7r7Y1GXg98xo5SdN/aiEgHs3bgW 684yaR6hDUj4x6h1PoFHRf0ZqL/3XBWSWH6cSthvQThMEsuT4u2d9YJBCKVCiHDFCY0+ GucfhILYstHUN1qYvY2qBrxRMZ6CLeJ3xb7jw+Xs/YhN2n2BQavL4f4+q6akqca2ElvZ 2AiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xeUihBhx; 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 lb17-20020a17090b4a5100b002474c31b885si10255229pjb.78.2023.04.18.00.54.24; Tue, 18 Apr 2023 00:54: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=xeUihBhx; 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 S230455AbjDRHqi (ORCPT + 99 others); Tue, 18 Apr 2023 03:46:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229721AbjDRHqh (ORCPT ); Tue, 18 Apr 2023 03:46:37 -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 53E74A8 for ; Tue, 18 Apr 2023 00:46:35 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id kt6so32657617ejb.0 for ; Tue, 18 Apr 2023 00:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681803994; x=1684395994; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=r75opw4l+CuhzHbMethMKplabYX6RCoTnwLJOAhIH2w=; b=xeUihBhxZpDw3QqpfDYWEsAjDVqperPh1t0wYprp0Xc0pDzXU2RUtVLV2Chco6lXQK y1zWf41LzWNQtKtfmvytgrSHu0h+8uazuqfDTa2UZ41gEwWWpIFWLsZ3G2WN57BBMsne nxNO0QoCslwB2reV1GDhXcC5FgpU1xblug5Q1r4ftpH+Kedkxx7XiA9mt8kjYsvT1MZT As7eLuhzgixF+k/fPGNbRltr52nKQzkj7hsl2ExdutdlE3tprI0kuflQ1cozOYV6cM1q PzG8I4ZtecLXmjLXDII8fBgK4Y7aoXGV8AYqqbmWRwv+oTqmVUo+zAJj/AbXULdhn7n6 8HWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681803994; x=1684395994; 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=r75opw4l+CuhzHbMethMKplabYX6RCoTnwLJOAhIH2w=; b=lHntYhG6bjz1/lbFif0y+sM2BvKTWfARN05FUopqsp9oHeUy22m815sVdxj0Uxnd1r VkSLvNxKu3JPxDlNc7JnBdxxvfyndR6fAh0+Y1GZdN3opdHDeQN9g7cNVzIQbBHCiWJZ g3i2UgcMs+yyfoc3AYu5hvF+iSHlzZEeISXiVLtsH7Xmjlf4zU7lw5L9Frx9RapxA048 izU5yAKiGqICQMqcnMn4CR5xjDXCE2yXRHDUVu3zAU+cqUO3o21QX4TYtEOnvNqDovwq 3NN8oYhwg3WIBJLfJKlNVrcBQTFwtvpZh4ecFB+edFV0AY24Pc2e8PqcS4fNVeddtlXH pVyw== X-Gm-Message-State: AAQBX9d4y6ERQaXhk3dv/pdKeBd4/SUH251bj2soGOWIrXmbGxu8Dkav r+sEKLuIR8S4emeP99VGXqwgXw== X-Received: by 2002:a17:907:6d24:b0:94f:395b:df1b with SMTP id sa36-20020a1709076d2400b0094f395bdf1bmr8173936ejc.21.1681803993713; Tue, 18 Apr 2023 00:46:33 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a276:7d35:5226:1c77]) by smtp.gmail.com with ESMTPSA id sa39-20020a1709076d2700b0094f410225c7sm3731993ejc.169.2023.04.18.00.46.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 00:46:33 -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 v2 1/4] ASoC: codecs: wcd9335: Simplify with dev_err_probe Date: Tue, 18 Apr 2023 09:46:27 +0200 Message-Id: <20230418074630.8681-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,URIBL_BLOCKED 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?1763499813080993223?= X-GMAIL-MSGID: =?utf-8?q?1763499813080993223?= Replace dev_err() in probe() path with dev_err_probe() to: 1. Make code a bit simpler and easier to read, 2. Do not print messages on deferred probe. Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Re-write commit msg. --- 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 Tue Apr 18 07:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2660862vqo; Tue, 18 Apr 2023 00:59:47 -0700 (PDT) X-Google-Smtp-Source: AKy350Z/bOrY23ThnQ/9Ipa/Q3Dwcq6ugXW8aufD4GyZlXTgevO4NFtxfphPRt6prts9kVGCxMzW X-Received: by 2002:a05:6a20:a125:b0:ec:7c4f:ed7a with SMTP id q37-20020a056a20a12500b000ec7c4fed7amr20337728pzk.34.1681804786761; Tue, 18 Apr 2023 00:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681804786; cv=none; d=google.com; s=arc-20160816; b=j6o4vzd+5DJmW+ypDvw1M6D1cPfibo5kfp00oovFnJSX3uAh8lc1n4ZIXoW4e/NRyY p0U5CoPzvh9CCdKGjkBQLOtsaJcImSK2qS8GCN1bgehtWLHgB9oh5+HhjVWUyZD4Nmvh C+22eIMoDuSH7B2g2+4DA59pQrADRjEJ+ha493O1o6Xb29tYh6tk9rCLVP5gLvjv6WSm uo4Tsfr8FNUGkqNuGHQvUHNqbzkambkBQsdK889MruHjwl+z20xOGKjokaxay6pplf7O NVw95zQKoiyM1euGgJl+x3HkV+tqYN18YiyQ9ZLDkH0YTZKj/mA/Om+hYLpkFXDSvdfl TtPw== 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=o12ebF9++JVUvhpdQh9deSW0oeUpmXNibeCUjBiWaVA=; b=PluT585wbW6gPgRVIwekF43RnfkG4/l13yMYIibBq8DlLCATI8s8EqyQ9g00jKi1Hy O8u/7nGoVXGbfBbGxs42ZUd8dnpP1EuDdrZ85wq4tbe5ZW06hL1DLhoF//62spnRe/7z eGs3XhT0/IMzB8MvGz2m0csVdhlWZd9Vhovpnvh85agmZ/itFqWPfpsP28uJqb8hsuRL uOfqLgDW9hQiXE3lx+x9ot+j4hjdFSMjJ6Jm30XpJHowq/p35HQ8y7xy5Ajm1/QTU/Ak ditMZZ/M+ZfBBYzejVKlfhBq2VUuzy8wKsQMhHhAIOyf3000ub3gebbqrfLYRiudWR1N Osjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YZNWGQsk; 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 j2-20020a63e742000000b0051fc46e23fesi167334pgk.126.2023.04.18.00.59.33; Tue, 18 Apr 2023 00:59: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=YZNWGQsk; 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 S230500AbjDRHqm (ORCPT + 99 others); Tue, 18 Apr 2023 03:46:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230325AbjDRHqh (ORCPT ); Tue, 18 Apr 2023 03:46:37 -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 38D7510D0 for ; Tue, 18 Apr 2023 00:46:36 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-94a342f15e4so530575166b.0 for ; Tue, 18 Apr 2023 00:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681803994; x=1684395994; 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=o12ebF9++JVUvhpdQh9deSW0oeUpmXNibeCUjBiWaVA=; b=YZNWGQskAWaR2q2RjOEHZVsl62XSVmgC9xJB4lIqLtYzbrKBJz9znlfxGyiVdkUTbD EdeEYATXSTBAFfnp8Of6o0p0Uf2s+9SyXuvyOyxfPgt4ElqPM2VawcxGGjm4EneE+kXt MFGh3VUrnCJsnlbq5X3xajzuvSiFwvpWOONF6u/LlD3QjoUItBVl2mDDU4QDy6Jf1COf UdYS8a/nH8SD5rlQc+EwU0y7vDaPjQopGhqdBx03jnsbrewjWqtwhOVOb9wNjo+m44ey OJzBONsullh0IJU0uKe574dyfz+TgD703l8I35ZXWMUAvAiTmgSxUOqOfU0rvXxsOjZ0 Q8aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681803994; x=1684395994; 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=o12ebF9++JVUvhpdQh9deSW0oeUpmXNibeCUjBiWaVA=; b=DU6fsV+8SkaB95s/SuOc9zqYvkq8R6RBzyH6zwCYyEpJl5WqpKRL9f29JS2ch1/2TT Vzpt/M/0eVVpqqs4zq/QmSczNMnQatsXP+pmVfn97V5B8xQhXI6i8v9FwRv07/azyqR1 gGsAJbAAWl44UaKUZEj2sXFFuafEx+yVh0JdkPcOrUELV5BZgOjYmo/fz19Mr0JoxxWO EjVQIp7/JvU74vWhf7BkHh7J1v74Oi8r5Ahd3XIYlXLA53DG3EFnWGZWgZ+ZACCJ0xSP y7agr0WzTX9HWycQpCOUMxgCBxRPx8N5M6HRe3BoSfkbJ5OW3auze04ESnb2gDDKmOXF UmfQ== X-Gm-Message-State: AAQBX9fkQFEpvKqmymJx88KTCpELnTiQZh2Mz9QjiZs8jqF0tS1/A/xo OwNrx3PSHRM5MoSeVxFGF/1HSA== X-Received: by 2002:a05:6402:748:b0:506:ae87:a36a with SMTP id p8-20020a056402074800b00506ae87a36amr1550021edy.14.1681803994735; Tue, 18 Apr 2023 00:46:34 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a276:7d35:5226:1c77]) by smtp.gmail.com with ESMTPSA id sa39-20020a1709076d2700b0094f410225c7sm3731993ejc.169.2023.04.18.00.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 00:46:34 -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 v2 2/4] ASoC: codecs: wcd934x: Simplify with dev_err_probe Date: Tue, 18 Apr 2023 09:46:28 +0200 Message-Id: <20230418074630.8681-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418074630.8681-1-krzysztof.kozlowski@linaro.org> References: <20230418074630.8681-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,URIBL_BLOCKED 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?1763500136281375988?= X-GMAIL-MSGID: =?utf-8?q?1763500136281375988?= Replace dev_err() in probe() path with dev_err_probe() to: 1. Make code a bit simpler and easier to read, 2. Do not print messages on deferred probe. Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Re-write commit msg. --- 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 Tue Apr 18 07:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2662244vqo; Tue, 18 Apr 2023 01:01:40 -0700 (PDT) X-Google-Smtp-Source: AKy350abSnmRbM0ytl6m1geVAaR4iCM1vigxFnd8fOwts8W1HURkw9KQ9E6nmZMGZ/tZLOs0I4Ew X-Received: by 2002:a05:6a20:8094:b0:e7:7844:903a with SMTP id c20-20020a056a20809400b000e77844903amr13321816pza.53.1681804900375; Tue, 18 Apr 2023 01:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681804900; cv=none; d=google.com; s=arc-20160816; b=JRaOOPoyukPRGxWaqJHIGME5/4W5eANQokS8WImSVC6vCOg1Ei/QZPh3dOJt55Ddpf IQparbW/WQ7AYfKL4M3PGGwKUpJitegVbYN469ZFpjVmplO+SKNURlAhYNM310IWlbPE hf4jhEigMPEi8dnS1bEhtljtVp27hkWsabskMNhfVE+zHGWtjc/89O+pxlelw0lDeQDP F+z3wr8uUMlAe3wbMTA7lVXcRy/2rnEDUtyLhmXKi9837lMYMa14K+zGbukMUwfCmO5h Q+7UlGyW03vYrxnTrlV8YPs7QjqSmNOyj93nzjOSt7DfyeyM6hcYClpZ9QaC31SVUvIt H/jQ== 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=1KzlXWIM5HS1BOW2B1whAuoVKMTEgEYpaiz3Oizdn5U=; b=r8q8Lj2Yz/YPxPKaun0BXUXfKi93J1dHdNFRLUpDGXIwc5Lsn/hu0TgF25cexVDZjF Rhva+8s8vEbvPNQsaPCv8z04G7sMTI+YFmB5oD+NELd5lwEyVuLmYmzJ3UhA6TzchcH1 3bKjWbixQ//O1C5k19/8eLHA7hBVj2xDR9mV2jyMv4wb41ClVqnl6/MrE9iD/9GQaJ0/ 7sgnGtrDP4QFd8BUWxrnv4AmZ2qBxllNW56YQaYHElLRgRHZ23NwxoRh7T9hsG52sepv 0SWqC3eg8sSeXINdRll1SH+2JtIkYFiN7/AAw55lH1g3Wja64g0NVSCPNO1M+vlAwB7t zNIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H19N0PQ5; 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 d21-20020a63d715000000b0051f663b7e8esi814574pgg.51.2023.04.18.01.01.27; Tue, 18 Apr 2023 01:01:40 -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=H19N0PQ5; 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 S231138AbjDRHqp (ORCPT + 99 others); Tue, 18 Apr 2023 03:46:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230440AbjDRHqi (ORCPT ); Tue, 18 Apr 2023 03:46:38 -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 778C7448C for ; Tue, 18 Apr 2023 00:46:37 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id fw30so18027077ejc.5 for ; Tue, 18 Apr 2023 00:46:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681803996; x=1684395996; 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=1KzlXWIM5HS1BOW2B1whAuoVKMTEgEYpaiz3Oizdn5U=; b=H19N0PQ5GtqPopJUPGOAT/1G76UPeZ8HVJxVpqisflVlalw7nlPEiStSQ6EUPADPbX YOX4RZbH9DQimMFZSa1e71+njuTL+LKQBoWCiOFEQH42PQWhKQn5J4+YJ310hkCWTwkQ qegT3GXD/L86fdNBpIW77DKCxA7FSb1wfKCjFVfg6FNM+Wrzhy5i6Vf72g3rAHArR92W u2h01c9IK6TbCrZOP9RlYCbVLP/rU9YovAro5tTsIQDDeVFqfqQTLGwU7583IadZz+Sn tJ4FvFtuV72mQIyjyk90db9ghTwKLgSwuL80xp7HgwphEo/bzmaY0h7nbv1qy83b2O0o LiOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681803996; x=1684395996; 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=1KzlXWIM5HS1BOW2B1whAuoVKMTEgEYpaiz3Oizdn5U=; b=JrrB12vvcNCWaVxtoEifIJopvgK459nfN4PKUcIa9X8Q4ca08/8Xnjo914P8gl8Elq szVCSFCGFY//aoQ9+zM+9BDeqFBRwqXASL+HsMkr9qhqLGrHmErr1ZQSAM5nxNhkMaoG QLNbTVVdUloYeiOM20lNCJAVFVvhEPUYjmvlSMyOFxNHVQ+zbzS1Z+R6fEPZt3kj+1gq iA3z8Qqp5hFOy2n3LX2YqynveZSH0vJ6flMVdBSqVqYs5O5ETKOND014gIQ4OqZnCnKQ r7ofBeaOSr/NMM9RUP60E+QtLFxD6M2DjWPB65H859U5ASh8TUsFMtSb7CFuHpynhYqn 1kPQ== X-Gm-Message-State: AAQBX9e96XsDnqEWXpHh5Jv0dbHbbg6HYumrN+FO2GptKOWYmJ18Cyf0 PtfpI704AXqjO1P4C7GQXy60mw== X-Received: by 2002:a17:906:7e0b:b0:94e:5c28:1c19 with SMTP id e11-20020a1709067e0b00b0094e5c281c19mr11010367ejr.5.1681803995746; Tue, 18 Apr 2023 00:46:35 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a276:7d35:5226:1c77]) by smtp.gmail.com with ESMTPSA id sa39-20020a1709076d2700b0094f410225c7sm3731993ejc.169.2023.04.18.00.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 00:46:35 -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 v2 3/4] ASoC: codecs: wcd934x: Simplify &pdev->dev in probe Date: Tue, 18 Apr 2023 09:46:29 +0200 Message-Id: <20230418074630.8681-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418074630.8681-1-krzysztof.kozlowski@linaro.org> References: <20230418074630.8681-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,URIBL_BLOCKED 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?1763500255492775569?= X-GMAIL-MSGID: =?utf-8?q?1763500255492775569?= 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 --- Changes in v2: 1. None. --- 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 Tue Apr 18 07:46:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84632 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2659386vqo; Tue, 18 Apr 2023 00:56:29 -0700 (PDT) X-Google-Smtp-Source: AKy350btnEc/M1Qj+NOvPrUeCWJR7cTV+PHSaSnJ1amL16qsObOiDD+r+BtypJbtS0eG+fts9Zma X-Received: by 2002:a17:902:f550:b0:1a1:b440:3773 with SMTP id h16-20020a170902f55000b001a1b4403773mr1394269plf.27.1681804588872; Tue, 18 Apr 2023 00:56:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681804588; cv=none; d=google.com; s=arc-20160816; b=x+U150BOVe5WPb8iGkDZCReXxHsTZgIAo2PCfcaKzxd6aYt1AsLVTaz/mogFxLlEYY Xhj26BDDBTMHBVqgKjVaTGnNXhym5kQf2ZuGgSKF3wFlalTFx665FP893m83SmEX+GEy YSG/ioK0RXntO3fZnuGxnD7IYdQhWu3ZDwio3rtfv+msZSCqaEu0YZ8PsMqEluD+apEp xyy22cPS/IIH0qbT5imJjSb6wXpvhh/dVnX6o9ULYTogWvKm+ZqlVL3ET9WsA9s8ghIa G5I1kRIapAPwmf1flGv2kSCo6xGQ5q8sM72T8WfS73aT+5d5OYqQT+insvQ/z6SNBZmi QTPw== 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=VSTh/SJop5c2Us/dQwQInLvSKG2b28WOhmpUgImXSN4=; b=uu3tclX/gy4Gg0ixa8uafFrHaDJ92iAN0Tqp9wNSvtvZap85lu344no7UqbJ0WJI9E Om1R2v3utrzYPf1ZXwNawGJZyT6l1hRrXIx0Oa07yDblqt8SZ9bpEfQF5VaQ3VUmWZHh Ch5PUtRo+YPbWYGPeWquVMSkcbDutF9BtqpBPDXYsaA/hh/i2rxhoi4gHpsye0XmLLuG QytLJDqPtzKXPJ4BL9hPUOlelt+dTvnPrvBhJ/48Xqjo7I5CSYKMeqapnvKsGSqdCg9s 61XQClgN145WadtZx9k1M01D5G7hdorDSucbXr3Z1hFRVdOoq4ItAjxPLUQAfjhPsgv2 mGSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JIXcMkwq; 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 g23-20020a1709029f9700b001a511921c06si13419137plq.358.2023.04.18.00.56.14; Tue, 18 Apr 2023 00:56: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=JIXcMkwq; 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 S230364AbjDRHqt (ORCPT + 99 others); Tue, 18 Apr 2023 03:46:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbjDRHqj (ORCPT ); Tue, 18 Apr 2023 03:46:39 -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 15728A8 for ; Tue, 18 Apr 2023 00:46:38 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id dm2so70924826ejc.8 for ; Tue, 18 Apr 2023 00:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681803996; x=1684395996; 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=VSTh/SJop5c2Us/dQwQInLvSKG2b28WOhmpUgImXSN4=; b=JIXcMkwqYs0HXlx9VovWlfO/IO9++uYT98RcF6INoHP4EgPbfvGOPQK1wUAQELPIdB W5T7j/au9BAmdU7nOY6jxXvLUxudGbK1t1mOIpCUqZRqqnzCUwe2ix1fZ9h7oXecqx+r PyJKJspYUymwBkNi7sFxN0azJce4VLjL0qv2hLFOauSfxPl5bOIguOqqj+0sWIW7s3qx HqN3ScBUfGn9fW4WGfbxWWhkGmHcR5o/US0p2E5zTGOoGQXMVn+jna9bK+zN6Qh9rUAl K5mxSbz9fS89h4O1enbZ+FldagCVrl9P7cAvtfb9NI2aB7WETL6ND2nVlMSBtEl0Qz6Z /ycg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681803996; x=1684395996; 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=VSTh/SJop5c2Us/dQwQInLvSKG2b28WOhmpUgImXSN4=; b=kFruY4n3tqcQ3ql3qZPkkoNKxbP+J32hUC83OByEDdU0cD/imXJgUR0bfRssmNIQu8 rIY0N9D6rIJyJZWmaT5iqdHGIudz/PKQ2+YxF5QCKOh/iRClYwP62AN571qDLVPlhyBU USvPlXM1vT9IWVrbnWM29XPSUdDXc570z7I/5kZ+WvaPOHN6HFYhSMoXr9ubsQ0rzfBf /8bvqtezb/DFHs5eCMgcwloA1/SMvsIsV1dkorHtt1z7deQemTmsRJdJ++9I97CuF0iz YwujsgeTjTvlLNUFqED/vCeDQCjTOSw5pury92U48wMZZbFfHeSQbbrZxWB7PUcKmT4i g9tw== X-Gm-Message-State: AAQBX9cywXBXYmD00zKy2KiKdak6Qf2QOJw7mnnya0vfa7nSjO2YvITz SLaeQPF7XuqcSQsARy1vqrSPZg== X-Received: by 2002:a17:907:2d09:b0:94f:444c:fc25 with SMTP id gs9-20020a1709072d0900b0094f444cfc25mr8326449ejc.12.1681803996664; Tue, 18 Apr 2023 00:46:36 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a276:7d35:5226:1c77]) by smtp.gmail.com with ESMTPSA id sa39-20020a1709076d2700b0094f410225c7sm3731993ejc.169.2023.04.18.00.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 00:46:36 -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 v2 4/4] ASoC: codecs: wcd938x: Simplify with dev_err_probe Date: Tue, 18 Apr 2023 09:46:30 +0200 Message-Id: <20230418074630.8681-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418074630.8681-1-krzysztof.kozlowski@linaro.org> References: <20230418074630.8681-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,URIBL_BLOCKED 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?1763499928360224110?= X-GMAIL-MSGID: =?utf-8?q?1763499928360224110?= Replace dev_err() in probe() path with dev_err_probe() to: 1. Make code a bit simpler and easier to read, 2. Do not print messages on deferred probe. Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Re-write commit msg. --- 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);