| Message ID | 20221129001633.v2.1.I8d1993f41f0da1eac0ecba321678ac489f9c0b9b@changeid (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 863b9179cee4570e5da4206dcf8dbcdcc37c8348 |
| Headers | show |
| Series | [v2] ASoC: qcom: lpass-sc7180: Delete redundant error log from _resume() | expand |
Hi, On Mon, Nov 28, 2022 at 4:16 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > 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(-) Reviewed-by: Douglas Anderson <dianders@chromium.org>
On Tue, 29 Nov 2022 00:16:54 +0000, Matthias Kaehlcke wrote: > 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. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: qcom: lpass-sc7180: Delete redundant error log from _resume() commit: 863b9179cee4570e5da4206dcf8dbcdcc37c8348 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
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)
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(-)