diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-03-03 16:20:56 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-03-03 16:20:56 +0300 |
| commit | 26ed1d29fc44f3f2f0c396c1392abefac5f0454e (patch) | |
| tree | ffba9ebddf759f04cbeca8adace5cc8093c58c2d /sound/soc/fsl/imx-pcm-rpmsg.c | |
| parent | e97fc9cffbb9f372b53b42c36cd7b20aab44a554 (diff) | |
| parent | 7933b90b42896f5b6596e6a829bb31c5121fc2a9 (diff) | |
| download | linux-26ed1d29fc44f3f2f0c396c1392abefac5f0454e.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/fsl/imx-pcm-rpmsg.c')
| -rw-r--r-- | sound/soc/fsl/imx-pcm-rpmsg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index 2f310994f7ee..6614b3447649 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -140,7 +140,6 @@ static int imx_rpmsg_pcm_hw_params(struct snd_soc_component *component, { struct rpmsg_info *info = dev_get_drvdata(component->dev); struct rpmsg_msg *msg; - int ret = 0; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { msg = &info->msg[TX_HW_PARAM]; @@ -184,7 +183,7 @@ static int imx_rpmsg_pcm_hw_params(struct snd_soc_component *component, info->send_message(msg, info); - return ret; + return 0; } static snd_pcm_uframes_t imx_rpmsg_pcm_pointer(struct snd_soc_component *component, @@ -282,7 +281,6 @@ static int imx_rpmsg_pcm_close(struct snd_soc_component *component, struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct rpmsg_info *info = dev_get_drvdata(component->dev); struct rpmsg_msg *msg; - int ret = 0; /* Flush work in workqueue to make TX_CLOSE is the last message */ flush_workqueue(info->rpmsg_wq); @@ -305,7 +303,7 @@ static int imx_rpmsg_pcm_close(struct snd_soc_component *component, dev_warn(rtd->dev, "Msg is dropped!, number is %d\n", info->msg_drop_count[substream->stream]); - return ret; + return 0; } static int imx_rpmsg_pcm_prepare(struct snd_soc_component *component, |