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;
From:   Matthias Kaehlcke <mka@chromium.org>
To:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
        Banajit Goswami <bgoswami@quicinc.com>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>,
        Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc:     Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>,
        linux-kernel@vger.kernel.org,
        Douglas Anderson <dianders@chromium.org>,
        alsa-devel@alsa-project.org, Judy Hsiao <judyhsiao@google.com>,
        Matthias Kaehlcke <mka@chromium.org>,
        Banajit Goswami <bgoswami@codeaurora.org>
Subject: [PATCH v2] ASoC: qcom: lpass-sc7180: Delete redundant error log from _resume()
Date:   Tue, 29 Nov 2022 00:16:54 +0000
Message-Id: <20221129001633.v2.1.I8d1993f41f0da1eac0ecba321678ac489f9c0b9b@changeid>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

sc7180_lpass_dev_resume() logs an error if clk_bulk_prepare_enable()
fails. The clock framework already generates error logs if anything
goes wrong, so the logging in _resume() is redundant, drop it.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---

Changes in v2:
- removed the log in the error path (requested by Doug)
- updated subject (was "ASoC: qcom: lpass-sc7180: Return 0 instead
  of 'ret' at the end of _resume()") and commit message

 sound/soc/qcom/lpass-sc7180.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c
index 6ad1c5b5f2de..db3be15cf14c 100644
--- a/sound/soc/qcom/lpass-sc7180.c
+++ b/sound/soc/qcom/lpass-sc7180.c
@@ -162,15 +162,9 @@ static int sc7180_lpass_exit(struct platform_device *pdev)
 
 static int sc7180_lpass_dev_resume(struct device *dev)
 {
-	int ret = 0;
 	struct lpass_data *drvdata = dev_get_drvdata(dev);
 
-	ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks);
-	if (ret) {
-		dev_err(dev, "sc7180 clk prepare and enable failed\n");
-		return ret;
-	}
-	return ret;
+	return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks);
 }
 
 static int sc7180_lpass_dev_suspend(struct device *dev)
-- 
2.38.1.584.g0f3c55d4c2-goog