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 80c0a1a956542dad594d364cdb778ba8ce8a6be1..93eba4fd277101d72661c4b9810be1bd21abab3d 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 a31aa471a1c219f3b0d48957c435766d78a2956c..4dd9591ee98b7596e6cbfb35a2b697c887a87579 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 c8522e2430f8af4cac8f095e67f34b7585c3c8ad..426ce37105aebd92f63364a395f700c6b2b2f1e7 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 430c070a1a0ee56880de342ca8a131043e087137..cb6d54db7189214e1bfce9a9a9de100499be4ee1 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 7e6c8d9c900bd07f1a928a7b6d0611fdbbb55c87..4556f105c793eb40018a4f1310c9d356ef33a742 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 8d550e82b46a82f93fd76930f8c4a492f5f15f36..6570209c1a63ef3d028f430477caa77c312bbd74 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 fdef5a008daffe0610602af6cd555c422a2ffd70..6f25e66344b7a4b46d6598619b6b1362cad8c39e 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 082f311d8b840d984a3fe5c93805e34be4b8e3c9..ad18c4e9a6704112e517052fb1306eefa94e7484 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 6ea9058fdb2a77ba5c7c2bc95db1bff7a5daa187..bf902540744c5ebc4a499fae00a2f00ccd64c3d5 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 9fcce86c6eb4874228f3ed55cdd8986b23fa4da7..4b6c02a402047864599da2a2bd683126c31f4d6a 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 f157f2d19efb4f97cf17f882468f469eae241f3f..e40563ca99fd5001136ad1c08f46a0998c9b9106 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 1e85242c8dd2b6f8fedc3046158749c05873087a..94fce07c83f9e91d5ddfe12c599209f5ea2906af 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 cfa146b6cf08790a849594c3d1ef98ddb6234894..30588d9e9ba3bcbe560259de24df95b781d9fe0e 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 44f857e90969174b817963fba8547210da49c424..b456b9d1466549c924fa45082037076199745fc0 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 0dcc6392a0cc8dfe5e9a76e8fed54ac2613e4948..335960cfd7ba13cb822e76e9826026074dfc1c9e 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 63bbfc30f35e9c0dbb9b74de387e1e01bb88d2a2..cfef00462f66125f700ac6894e22bf0315b97d68 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;