[v2] ASoC: compress: Set reasonable compress id string

Commit Message

Donglin Peng Aug. 8, 2017, 3:31 a.m. UTC

For dynamic compress rtd, the codec_dai may not have any
actual meaning(like snd-soc-dummy-dai), so compress id
can just use the value of dai_link->stream_name. But for
others, its codec_dai has actual meaning, so compress id
can include codec_dai name.

Signed-off-by: pengdonglin <[e-mail]>
---
 sound/soc/soc-compress.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

        if (codec_dai->driver->capture.channels_min)
@@ -758,7 +755,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime
*rtd, int num)
                return -EINVAL;
        }

-       if(playback)
+       if (playback)
                direction = SND_COMPRESS_PLAYBACK;
        else
                direction = SND_COMPRESS_CAPTURE;
@@ -797,19 +794,18 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime
*rtd, int num)
                else if (rtd->dai_link->dpcm_capture)
                        be_pcm->streams[SNDRV_PCM_STRE
AM_CAPTURE].substream->private_data = rtd;
                memcpy(compr->ops, &soc_compr_dyn_ops,
sizeof(soc_compr_dyn_ops));
-       } else
+       } else {
+               snprintf(new_name, sizeof(new_name), "%s %s-%d",
+                       rtd->dai_link->stream_name, codec_dai->name, num);
+
                memcpy(compr->ops, &soc_compr_ops, sizeof(soc_compr_ops));
+       }

        /* Add copy callback for not memory mapped DSPs */
        if (platform->driver->compr_ops && platform->driver->compr_ops->c
opy)
                compr->ops->copy = soc_compr_copy;

        mutex_init(&compr->lock);
-
-       snprintf(new_name, sizeof(new_name), "%s %s-%d",
-                rtd->dai_link->stream_name,
-                rtd->codec_dai->name, num);
-
        ret = snd_compress_new(rtd->card->snd_card, num, direction,
                                new_name, compr);
        if (ret < 0) {
--
2.11.0

Comments

Mark Brown Aug. 16, 2017, 12:06 p.m. UTC | #1

On Tue, Aug 08, 2017 at 11:31:21AM +0800, Donglin Peng wrote:

> --- a/sound/soc/soc-compress.c
> +++ b/sound/soc/soc-compress.c
> @@ -737,9 +737,6 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime
> *rtd, int num)
>         }

It looks like your mail has whitespace damage, it's been at least word
wrapped, so I can't apply - please check and resend (git send-email will
usually do the right thing).

Patch

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 206f36bf43e8..b6a071461b10 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -737,9 +737,6 @@  int snd_soc_new_compress(struct snd_soc_pcm_runtime
*rtd, int num)
        }

        /* check client and interface hw capabilities */
-       snprintf(new_name, sizeof(new_name), "%s %s-%d",
-                       rtd->dai_link->stream_name, codec_dai->name, num);
-
        if (codec_dai->driver->playback.channels_min)
                playback = 1;