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 68A112472BD for ; Mon, 13 Oct 2025 19:28:32 +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=1760383712; cv=none; b=EqrV/FksBjSCZkn9KmlK8qRRYoD7F1r37/+T8A5U1hvrTzHmhrAcErSNyxOE616xWVB5EJtEWtlujqhBByaNjwszuKqeAPH7iVU9HTko8I0ez4+O2t+hguODBZrKBhz9UCNY+RmZk/c3qNj7noRieb/e1l6QCr5b9wJfLJvX72A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760383712; c=relaxed/simple; bh=QPA1Ws5e2EeJ0he2aF7ep31/DiTY429D+Re402pd3rI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YdTuEQ4Mpd9dFno+QI2k/jjw/p0bvF2tuX2pk2fCR2uGP2G/8dlYdBzFMP3wIrFbm2cjqNoutyM124QgNwmavI1LIsZOhe1NzhiwVZRyFEAAtRHnIKJoZaeI6TEunxU/X7iwcM0YI+2g70JF7I2C87SxefZijMdKBD6ez2m90GQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bXdTjo9H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bXdTjo9H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50359C4CEE7; Mon, 13 Oct 2025 19:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760383711; bh=QPA1Ws5e2EeJ0he2aF7ep31/DiTY429D+Re402pd3rI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bXdTjo9HnRFTcDMfZZ8rqoy7izwRNAxkyXbK77Hvjl7HafZyHrparI1bfxJKKnzYR JapBXbfB5Ia/V4A+0n5L2MB3iXqITrjjJkArrWyEZzVxBJicsHkzz3PDSgwMhnZSjh f4q0wJuUXASoZBkx9WIy1mTQI75cOuUTVz3wUX1/VQQ4J5TAIJm18KC0dBKo5Ce8w2 b4J1dzO9ZQf9bysmrF5eLKEoLjruuUFXGo21zugzoo59Qcs3t6VcSHZOEPV7V/C/+J GMbO6GRcySAJW38LhQHO7zck9DvkRvXbPOw4WEdeikB5E/QRRHPrWAk+o+2Uj1xH9E bAbZpe7dzRhGw== From: Sasha Levin To: stable@vger.kernel.org Cc: Krzysztof Kozlowski , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y 1/2] ASoC: codecs: wcd934x: Simplify with dev_err_probe Date: Mon, 13 Oct 2025 15:28:28 -0400 Message-ID: <20251013192829.3566355-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025101305-until-selector-fc19@gregkh> References: <2025101305-until-selector-fc19@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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 765ac2a3e9638..0fcd2b80476f7 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -5885,10 +5885,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); @@ -5940,19 +5939,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); -- 2.51.0