From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61546301707; Mon, 27 Oct 2025 18:56:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761591405; cv=none; b=mxPEXwQUiejHCcykFmDgdUe9yUZn++WbIHySUZGQSuvbcH63XaVoV79U/mWgA9vmzwjINaL+gjPSuM+ALFJreVqtWFh/KPwPQEY04ROGkiuSaeT9QhUQyPbvsVQkmTfoF9RywayFU0W8FcNBO9qRc8q3gOn/qzTRJEN672303YE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761591405; c=relaxed/simple; bh=SBq0GYPJXLzyOwrL3n1ARNAfrG7ughbNRvzVlN6zoNY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C3pwOWLYlUj4n7pLLTK2vfBDxkTNJPO/pCf4EtHpnT+v6MMSqAxpewC50sLOQ4KEXuFGakfByN+WHsrKE6yhYaZSKeN5lp2/Om9cKXnAzBRwg5N5Xa5U2fOam4z+saFZsrHzt6m3Ilm5F/j8Lj85u9vjBgcvgeGRCKxTQE8z7Qg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=drZxKSOc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="drZxKSOc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA9CAC4CEF1; Mon, 27 Oct 2025 18:56:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761591405; bh=SBq0GYPJXLzyOwrL3n1ARNAfrG7ughbNRvzVlN6zoNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=drZxKSOcApzEa4i3iUyE2GEWdqzB/Y6UmRHv8QJkJeULYRzbkvOFZxew7KU/7cKCl 9uZOmSNObPmrlILceLJdribPfwgS0x7yD1jQ+sVEaYmUQurIteGG7qzLVfgyR6Dt9M 8f+tSUukQBzvArp1/5jHUjQLKQIfEuhjh83WWLzg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Krzysztof Kozlowski , Mark Brown , Sasha Levin Subject: [PATCH 5.10 183/332] ASoC: codecs: wcd934x: Simplify with dev_err_probe Date: Mon, 27 Oct 2025 19:33:56 +0100 Message-ID: <20251027183529.497483937@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183524.611456697@linuxfoundation.org> References: <20251027183524.611456697@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Krzysztof Kozlowski [ Upstream commit fa92f4294283cc7d1f29151420be9e9336182518 ] 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 Link: https://lore.kernel.org/r/20230418074630.8681-2-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown Stable-dep-of: 4e65bda8273c ("ASoC: wcd934x: fix error handling in wcd934x_codec_parse_data()") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wcd934x.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -5032,10 +5032,9 @@ static int wcd934x_codec_parse_data(stru 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); @@ -5074,19 +5073,15 @@ static int wcd934x_codec_probe(struct pl 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, "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);