From patchwork Wed May 8 10:58:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Weber X-Patchwork-Id: 13658551 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A09BC41513 for ; Wed, 8 May 2024 11:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r0Vy7rj+TEgTBsLt8Nrgmv+Mj3phSpBTtIhIQd6ejTs=; b=AT8zO8H0Dx3wYq QGfC7SBMhz7oE/dXzwMAjUOLkJ0bhNIlnfam69OQaH8nhRjyRbeUYzI57yEJVZ751YqO+80MK76aI dYAYWh7PdIWzE8/4L/5oT73RotR/bQISD9UEvxvUEh8RMzAgncHMK/Dx+KX3bJ8jBN1Y0GjqE1A45 4DzJcSBNlEma6j/vTqJW3mtBgRsM6cli7vtDLFdB5DkYFl8TWN68ygaQwZztTaVWFF+8wlPYmt/km sPh8qT/VZtbWKI2j2hcotm/DH3Gd+29Zk7FeQlB/G01bdAxgrw9gcX1M71HwiRehyWooHAmJj4u3z yl9eaVFJ11L2s6WRT4pg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4f3S-0000000F6C0-0Dgz; Wed, 08 May 2024 11:01:46 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4f39-0000000F5xB-0tQS for linux-arm-kernel@lists.infradead.org; Wed, 08 May 2024 11:01:28 +0000 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a59b81d087aso929922166b.3 for ; Wed, 08 May 2024 04:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715166085; x=1715770885; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=eh0hh6ynZxtBGDzmGDI5+hS0xKp2HfOEvcy4GZsRfWo=; b=CYyhb0r1v2sSgssqtHK2A8FS7+2FhmR/4olJA9ovqkKQCcghrzPfwhXjQAmM1ZijDD 8l8JmiGBJ6TLl6uWrfI2E9Wy6C9AIZZTSRMm76OQhX5WLxq2fNkrKdspSvpQs/e1x/qt R+DmAeKFn5nTwLZ61cxI7+oQX1hLSY2f2IkPKVOZufdf1WXOxxcFe9MRzU0CPxJWTuQj p2qu63Z/UttdgxCdS6n1Xtlnrd5U01EWc1UFba05+sp3N/TArUfV0xt779v0zytHfCVu eWR28rSoP6xHrAGegL3CqYZOvOvvqU/3DTXBzR83dZ1MdRnGF4mE3dbKdlcw4C1e/+wl JpPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715166085; x=1715770885; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eh0hh6ynZxtBGDzmGDI5+hS0xKp2HfOEvcy4GZsRfWo=; b=c7q26Qk6Tm3K8KcTl1CrW7d2XNeKMTJDceM47M0qJvezRpf/zrnqSetooEuVwFoDuM gNchttPHp7ZkzDeAMUL/t5fB/JPLy386q48iwo/0LdkoyIm/fyhqj+QyzpD37I8DmfOb 5M2ZxpLx6nCbYNsXUIPzdsfHoJQsVQREOkU3fiyv2xAFnEl/op9LuwsN7eEUpXmEaU86 r8N+6fyCRK7louUJStgAMQTuHPXNMgOMzQsOOXEsUA0NLZE8OgLgSS9jL4Z8e0vUGH+E qNqFu7X0HBcRf3Tk2D8QG+hHmJBkDuGXnUv6/JWjwaDDEste9A9BwPS3VpoNIgDUpz+C QK5g== X-Forwarded-Encrypted: i=1; AJvYcCWyISTpeocOP8FkrbldmLXNpEmcuFnpnhkch267dCPv5E7CS4J0I9zrVrXokfZ4Vp5ZdBNRuvv5b0wRvcNvr2Dik2P0OLQcMz3yM/1h2rc3nZPggy4= X-Gm-Message-State: AOJu0Yxd0sGQI6sESXstrbWPNSSBPp0iBOazREKSU4BXyrbVxhYV8/UZ UV0vowqZF3Dh27kGloEdZvYn94ssObBuOu5Cq0Tnkm57F6H4YZZ2 X-Google-Smtp-Source: AGHT+IEBwQsbB5ly9Co7wAOpW5LM6EH159oeIG9hfELSBdMplK0VTNfidDLRoB93iPYNNHuID+ms/g== X-Received: by 2002:a50:d7db:0:b0:56e:7722:553 with SMTP id 4fb4d7f45d1cf-5731d9d9ecbmr1973462a12.24.1715166084426; Wed, 08 May 2024 04:01:24 -0700 (PDT) Received: from hex.my.domain (83.8.126.253.ipv4.supernova.orange.pl. [83.8.126.253]) by smtp.gmail.com with ESMTPSA id m6-20020a056402510600b005726b58a436sm7455793edd.30.2024.05.08.04.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 04:01:24 -0700 (PDT) From: Artur Weber Date: Wed, 08 May 2024 12:58:53 +0200 Subject: [PATCH v2 5/7] ASoC: samsung: midas_wm1811: Use dev_err_probe where appropriate MIME-Version: 1.0 Message-Id: <20240508-midas-wm1811-gpio-jack-v2-5-b4d36cd02c6e@gmail.com> References: <20240508-midas-wm1811-gpio-jack-v2-0-b4d36cd02c6e@gmail.com> In-Reply-To: <20240508-midas-wm1811-gpio-jack-v2-0-b4d36cd02c6e@gmail.com> To: Sylwester Nawrocki , Krzysztof Kozlowski Cc: Liam Girdwood , Mark Brown , Rob Herring , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Alim Akhtar , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Artur Weber X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715166076; l=2433; i=aweber.kernel@gmail.com; s=20231030; h=from:subject:message-id; bh=zl7AH36vmygEV4JVzP5ZRpRVT0yrltHsi0L0sBPvpeI=; b=fe+pSCvp0hASloJ0sPUz+l38OVaL8jW3+JqL69/Fa0Vyl+oCbv43o8wgqeZZwlLvsGsOL8qOh to+MdKSo025DMN6qoynkF5EzPkUi5GX8nq5bbd2hLMj8pAZXpr+03D7 X-Developer-Key: i=aweber.kernel@gmail.com; a=ed25519; pk=RhDBfWbJEHqDibXbhNEBAnc9FMkyznGxX/hwfhL8bv8= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240508_040127_320277_D7F5A6D3 X-CRM114-Status: GOOD ( 13.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since we're already using it in the newly-added GPIO requests for jack detection, extend it to the previous checks as well. Signed-off-by: Artur Weber --- Changes in v2: - Added this commit --- sound/soc/samsung/midas_wm1811.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c index ce94550ee32e..91f4be98723c 100644 --- a/sound/soc/samsung/midas_wm1811.c +++ b/sound/soc/samsung/midas_wm1811.c @@ -646,16 +646,14 @@ static int midas_probe(struct platform_device *pdev) card->dev = dev; priv->reg_mic_bias = devm_regulator_get(dev, "mic-bias"); - if (IS_ERR(priv->reg_mic_bias)) { - dev_err(dev, "Failed to get mic bias regulator\n"); - return PTR_ERR(priv->reg_mic_bias); - } + if (IS_ERR(priv->reg_mic_bias)) + return dev_err_probe(dev, PTR_ERR(priv->reg_mic_bias), + "Failed to get mic bias regulator\n"); priv->reg_submic_bias = devm_regulator_get(dev, "submic-bias"); - if (IS_ERR(priv->reg_submic_bias)) { - dev_err(dev, "Failed to get submic bias regulator\n"); - return PTR_ERR(priv->reg_submic_bias); - } + if (IS_ERR(priv->reg_submic_bias)) + return dev_err_probe(dev, PTR_ERR(priv->reg_submic_bias), + "Failed to get submic bias regulator\n"); priv->reg_headset_mic_bias = devm_regulator_get_optional(dev, "headset-mic-bias"); @@ -669,17 +667,15 @@ static int midas_probe(struct platform_device *pdev) } priv->gpio_fm_sel = devm_gpiod_get_optional(dev, "fm-sel", GPIOD_OUT_HIGH); - if (IS_ERR(priv->gpio_fm_sel)) { - dev_err(dev, "Failed to get FM selection GPIO\n"); - return PTR_ERR(priv->gpio_fm_sel); - } + if (IS_ERR(priv->gpio_fm_sel)) + return dev_err_probe(dev, PTR_ERR(priv->gpio_fm_sel), + "Failed to get FM selection GPIO\n"); priv->gpio_lineout_sel = devm_gpiod_get_optional(dev, "lineout-sel", GPIOD_OUT_HIGH); - if (IS_ERR(priv->gpio_lineout_sel)) { - dev_err(dev, "Failed to get line out selection GPIO\n"); - return PTR_ERR(priv->gpio_lineout_sel); - } + if (IS_ERR(priv->gpio_lineout_sel)) + return dev_err_probe(dev, PTR_ERR(priv->gpio_lineout_sel), + "Failed to get line out selection GPIO\n"); priv->gpio_headset_detect = devm_gpiod_get_optional(dev, "headset-detect", GPIOD_IN);