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)