ASoC: soc-pcm: remove dpcm_xxx flags

dpcm_xxx flags are no longer needed. Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/875xpm9vh3.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 8a1db45988ba61b0034895f7b13b05afc51dd3de..3e72317e2c20f16f5377cddbe0bbd48920f10aeb 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -820,11 +820,6 @@ struct snd_soc_dai_link {
        /* This DAI link can route to other DAI links at runtime (Frontend)*/
        unsigned int dynamic:1;
 
-       /* REMOVE ME */
-       /* DPCM capture and Playback support */
-       unsigned int dpcm_capture:1;
-       unsigned int dpcm_playback:1;
-
        /* DPCM used FE & BE merged format */
        unsigned int dpcm_merged_format:1;
        /* DPCM used FE & BE merged channel */

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index e2c5300df0f2524b63954dc58320f65f83955ae0..5142d1abbc7b0f88934824926d7ce5285d0858a9 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2844,39 +2844,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
                                has_capture = 1;
                }
 
-               /*
-                * REMOVE ME
-                *
-                * dpcm_xxx flag will be removed soon, Indicates warning if dpcm_xxx flag was used
-                * as availability limitation
-                */
-               if (has_playback && has_capture) {
-                       if ( dai_link->dpcm_playback &&
-                           !dai_link->dpcm_capture  &&
-                           !dai_link->playback_only) {
-                               dev_warn(rtd->card->dev,
-                                        "both playback/capture are available,"
-                                        " but not using playback_only flag (%s)\n",
-                                        dai_link->stream_name);
-                               dev_warn(rtd->card->dev,
-                                        "dpcm_playback/capture are no longer needed,"
-                                        " please use playback/capture_only instead\n");
-                               has_capture = 0;
-                       }
-
-                       if (!dai_link->dpcm_playback &&
-                            dai_link->dpcm_capture  &&
-                           !dai_link->capture_only) {
-                               dev_warn(rtd->card->dev,
-                                        "both playback/capture are available,"
-                                        " but not using capture_only flag (%s)\n",
-                                        dai_link->stream_name);
-                               dev_warn(rtd->card->dev,
-                                        "dpcm_playback/capture are no longer needed,"
-                                        " please use playback/capture_only instead\n");
-                               has_playback = 0;
-                       }
-               }
        } else {
                struct snd_soc_dai *codec_dai;