ASoC: intel: remove dpcm_xxx flags

dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to
xxx_only if needed.

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

diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c
index 80c0a1a..93eba4f 100644 (file)
--- a/sound/soc/intel/avs/boards/da7219.c
+++ b/sound/soc/intel/avs/boards/da7219.c
@@ -203,8 +203,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->exit = avs_da7219_codec_exit;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c
index a31aa47..4dd9591 100644 (file)
--- a/sound/soc/intel/avs/boards/dmic.c
+++ b/sound/soc/intel/avs/boards/dmic.c
@@ -22,7 +22,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
        {
                .name = "DMIC",
                .id = 0,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .nonatomic = 1,
                .no_pcm = 1,
                SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
@@ -30,7 +30,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
        {
                .name = "DMIC WoV",
                .id = 1,
-               .dpcm_capture = 1,
+               .capture_only = 1,
                .nonatomic = 1,
                .no_pcm = 1,
                .ignore_suspend = 1,

diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c
index c8522e2..426ce37 100644 (file)
--- a/sound/soc/intel/avs/boards/es8336.c
+++ b/sound/soc/intel/avs/boards/es8336.c
@@ -233,8 +233,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->ops = &avs_es8336_ops;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c
index 430c070..cb6d54d 100644 (file)
--- a/sound/soc/intel/avs/boards/hdaudio.c
+++ b/sound/soc/intel/avs/boards/hdaudio.c
@@ -39,8 +39,6 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int
                dl[i].id = i;
                dl[i].nonatomic = 1;
                dl[i].no_pcm = 1;
-               dl[i].dpcm_playback = 1;
-               dl[i].dpcm_capture = 1;
                dl[i].platforms = platform;
                dl[i].num_platforms = 1;
                dl[i].ignore_pmdown_time = 1;
@@ -160,8 +158,6 @@ static const struct snd_soc_dai_link probing_link = {
        .id = -1,
        .nonatomic = 1,
        .no_pcm = 1,
-       .dpcm_playback = 1,
-       .dpcm_capture = 1,
        .cpus = &snd_soc_dummy_dlc,
        .num_cpus = 1,
        .init = avs_probing_link_init,

diff --git a/sound/soc/intel/avs/boards/i2s_test.c b/sound/soc/intel/avs/boards/i2s_test.c
index 7e6c8d9..4556f10 100644 (file)
--- a/sound/soc/intel/avs/boards/i2s_test.c
+++ b/sound/soc/intel/avs/boards/i2s_test.c
@@ -46,8 +46,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->id = 0;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/max98357a.c b/sound/soc/intel/avs/boards/max98357a.c
index 8d550e8..6570209 100644 (file)
--- a/sound/soc/intel/avs/boards/max98357a.c
+++ b/sound/soc/intel/avs/boards/max98357a.c
@@ -82,7 +82,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->be_hw_params_fixup = avs_max98357a_be_fixup;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_playback = 1;
+       dl->playback_only = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c
index fdef5a0..6f25e66 100644 (file)
--- a/sound/soc/intel/avs/boards/max98373.c
+++ b/sound/soc/intel/avs/boards/max98373.c
@@ -134,8 +134,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->be_hw_params_fixup = avs_max98373_be_fixup;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
        dl->ignore_pmdown_time = 1;
        dl->ops = &avs_max98373_ops;
 

diff --git a/sound/soc/intel/avs/boards/max98927.c b/sound/soc/intel/avs/boards/max98927.c
index 082f311..ad18c4e 100644 (file)
--- a/sound/soc/intel/avs/boards/max98927.c
+++ b/sound/soc/intel/avs/boards/max98927.c
@@ -131,8 +131,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->be_hw_params_fixup = avs_max98927_be_fixup;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
        dl->ignore_pmdown_time = 1;
        dl->ops = &avs_max98927_ops;
 

diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c
index 6ea9058..bf90254 100644 (file)
--- a/sound/soc/intel/avs/boards/nau8825.c
+++ b/sound/soc/intel/avs/boards/nau8825.c
@@ -210,8 +210,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->ops = &avs_nau8825_ops;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c
index 9fcce86..4b6c02a 100644 (file)
--- a/sound/soc/intel/avs/boards/rt274.c
+++ b/sound/soc/intel/avs/boards/rt274.c
@@ -184,8 +184,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->be_hw_params_fixup = avs_rt274_be_fixup;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c
index f157f2d..e40563c 100644 (file)
--- a/sound/soc/intel/avs/boards/rt286.c
+++ b/sound/soc/intel/avs/boards/rt286.c
@@ -153,8 +153,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->ops = &avs_rt286_ops;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c
index 1e85242..94fce07 100644 (file)
--- a/sound/soc/intel/avs/boards/rt298.c
+++ b/sound/soc/intel/avs/boards/rt298.c
@@ -173,8 +173,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->ops = &avs_rt298_ops;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/rt5514.c b/sound/soc/intel/avs/boards/rt5514.c
index cfa146b..30588d9 100644 (file)
--- a/sound/soc/intel/avs/boards/rt5514.c
+++ b/sound/soc/intel/avs/boards/rt5514.c
@@ -121,7 +121,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->be_hw_params_fixup = avs_rt5514_be_fixup;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
+       dl->capture_only = 1;
        dl->ops = &avs_rt5514_ops;
 
        *dai_link = dl;

diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c
index 44f857e..b456b9d 100644 (file)
--- a/sound/soc/intel/avs/boards/rt5663.c
+++ b/sound/soc/intel/avs/boards/rt5663.c
@@ -171,8 +171,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->be_hw_params_fixup = avs_rt5663_be_fixup;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
        dl->ops = &avs_rt5663_ops;
 
        *dai_link = dl;

diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c
index 0dcc639..335960c 100644 (file)
--- a/sound/soc/intel/avs/boards/rt5682.c
+++ b/sound/soc/intel/avs/boards/rt5682.c
@@ -242,8 +242,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->ops = &avs_rt5682_ops;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
 
        *dai_link = dl;
 

diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c
index 63bbfc3..cfef004 100644 (file)
--- a/sound/soc/intel/avs/boards/ssm4567.c
+++ b/sound/soc/intel/avs/boards/ssm4567.c
@@ -121,8 +121,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        dl->be_hw_params_fixup = avs_ssm4567_be_fixup;
        dl->nonatomic = 1;
        dl->no_pcm = 1;
-       dl->dpcm_capture = 1;
-       dl->dpcm_playback = 1;
        dl->ignore_pmdown_time = 1;
 
        *dai_link = dl;