diff mbox series

ASoC: SOF: ipc: Remove redundant error check from sof_ipc_tx_message_unlocked

Message ID 20210916125725.25934-1-peter.ujfalusi@linux.intel.com (mailing list archive)
State Accepted
Commit f6b0c731a01fc581fcc4fb227e2d3ad9e0cb31d6
Headers show
Series ASoC: SOF: ipc: Remove redundant error check from sof_ipc_tx_message_unlocked | expand

Commit Message

Peter Ujfalusi Sept. 16, 2021, 12:57 p.m. UTC 
If the snd_sof_dsp_send_msg() failed then we have already returned from
sof_ipc_tx_message_unlocked() with the error message.

There is no need to check if ret is really 0 after this and we can return
directly the return value from tx_wait_done()

At the same time make the remaining checks for error (ret) to match.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/ipc.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Mark Brown Sept. 17, 2021, 2:03 p.m. UTC | #1 
On Thu, 16 Sep 2021 15:57:25 +0300, Peter Ujfalusi wrote:
> If the snd_sof_dsp_send_msg() failed then we have already returned from
> sof_ipc_tx_message_unlocked() with the error message.
> 
> There is no need to check if ret is really 0 after this and we can return
> directly the return value from tx_wait_done()
> 
> At the same time make the remaining checks for error (ret) to match.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: ipc: Remove redundant error check from sof_ipc_tx_message_unlocked
      commit: f6b0c731a01fc581fcc4fb227e2d3ad9e0cb31d6

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 mbox series

Patch

diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
index a4fe007a0e4d..969b017e68d4 100644
--- a/sound/soc/sof/ipc.c
+++ b/sound/soc/sof/ipc.c
@@ -286,7 +286,7 @@  static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc, u32 header,
 
 	spin_unlock_irq(&sdev->ipc_lock);
 
-	if (ret < 0) {
+	if (ret) {
 		dev_err_ratelimited(sdev->dev,
 				    "error: ipc tx failed with error %d\n",
 				    ret);
@@ -296,10 +296,7 @@  static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc, u32 header,
 	ipc_log_header(sdev->dev, "ipc tx", msg->header);
 
 	/* now wait for completion */
-	if (!ret)
-		ret = tx_wait_done(ipc, msg, reply_data);
-
-	return ret;
+	return tx_wait_done(ipc, msg, reply_data);
 }
 
 /* send IPC message from host to DSP */