Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: Intel: sof_sdw: remove .init callbacks
Some codec .init callbacks are empty after removing dai_links->init =
xxx_rtd_init;. Remove those callbacks.
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240208165545.93811-19-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Bard Liao
and committed by
Mark Brown
579d6596
8266c731
-112
-12
sound/soc/intel/boards/sof_sdw.c
-12
sound/soc/intel/boards/sof_sdw.c
···
650
650
.dai_name = "rt700-aif1",
651
651
.dai_type = SOF_SDW_DAI_TYPE_JACK,
652
652
.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
653
-
.init = sof_sdw_rt700_init,
654
653
.rtd_init = rt700_rtd_init,
655
654
},
656
655
},
···
705
706
.dai_name = "rt712-sdca-aif2",
706
707
.dai_type = SOF_SDW_DAI_TYPE_AMP,
707
708
.dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},
708
-
.init = sof_sdw_rt712_spk_init,
709
709
.rtd_init = rt712_spk_rtd_init,
710
710
},
711
711
},
···
719
721
.dai_name = "rt712-sdca-dmic-aif1",
720
722
.dai_type = SOF_SDW_DAI_TYPE_MIC,
721
723
.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
722
-
.init = sof_sdw_rt712_sdca_dmic_init,
723
724
.rtd_init = rt712_sdca_dmic_rtd_init,
724
725
},
725
726
},
···
749
752
.dai_name = "rt712-sdca-dmic-aif1",
750
753
.dai_type = SOF_SDW_DAI_TYPE_MIC,
751
754
.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
752
-
.init = sof_sdw_rt712_sdca_dmic_init,
753
755
.rtd_init = rt712_sdca_dmic_rtd_init,
754
756
},
755
757
},
···
811
815
.dai_name = "rt715-aif2",
812
816
.dai_type = SOF_SDW_DAI_TYPE_MIC,
813
817
.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
814
-
.init = sof_sdw_rt715_sdca_init,
815
818
.rtd_init = rt715_sdca_rtd_init,
816
819
},
817
820
},
···
826
831
.dai_name = "rt715-aif2",
827
832
.dai_type = SOF_SDW_DAI_TYPE_MIC,
828
833
.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
829
-
.init = sof_sdw_rt715_sdca_init,
830
834
.rtd_init = rt715_sdca_rtd_init,
831
835
},
832
836
},
···
841
847
.dai_name = "rt715-aif2",
842
848
.dai_type = SOF_SDW_DAI_TYPE_MIC,
843
849
.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
844
-
.init = sof_sdw_rt715_init,
845
850
.rtd_init = rt715_rtd_init,
846
851
},
847
852
},
···
856
863
.dai_name = "rt715-aif2",
857
864
.dai_type = SOF_SDW_DAI_TYPE_MIC,
858
865
.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
859
-
.init = sof_sdw_rt715_init,
860
866
.rtd_init = rt715_rtd_init,
861
867
},
862
868
},
···
927
935
.dai_name = "rt5682-sdw",
928
936
.dai_type = SOF_SDW_DAI_TYPE_JACK,
929
937
.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
930
-
.init = sof_sdw_rt5682_init,
931
938
.rtd_init = rt5682_rtd_init,
932
939
},
933
940
},
···
954
963
.dai_name = "cs42l42-sdw",
955
964
.dai_type = SOF_SDW_DAI_TYPE_JACK,
956
965
.dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
957
-
.init = sof_sdw_cs42l42_init,
958
966
.rtd_init = cs42l42_rtd_init,
959
967
},
960
968
},
···
968
978
.dai_name = "cs42l43-dp5",
969
979
.dai_type = SOF_SDW_DAI_TYPE_JACK,
970
980
.dailink = {SDW_JACK_OUT_DAI_ID, SDW_UNUSED_DAI_ID},
971
-
.init = sof_sdw_cs42l43_hs_init,
972
981
.rtd_init = cs42l43_hs_rtd_init,
973
982
},
974
983
{
···
975
986
.dai_name = "cs42l43-dp1",
976
987
.dai_type = SOF_SDW_DAI_TYPE_MIC,
977
988
.dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
978
-
.init = sof_sdw_cs42l43_dmic_init,
979
989
.rtd_init = cs42l43_dmic_rtd_init,
980
990
},
981
991
{
-16
sound/soc/intel/boards/sof_sdw_cs42l42.c
-16
sound/soc/intel/boards/sof_sdw_cs42l42.c
···
121
121
122
122
return ret;
123
123
}
124
-
125
-
int sof_sdw_cs42l42_init(struct snd_soc_card *card,
126
-
const struct snd_soc_acpi_link_adr *link,
127
-
struct snd_soc_dai_link *dai_links,
128
-
struct sof_sdw_codec_info *info,
129
-
bool playback)
130
-
{
131
-
/*
132
-
* headset should be initialized once.
133
-
* Do it with dai link for playback.
134
-
*/
135
-
if (!playback)
136
-
return 0;
137
-
138
-
return 0;
139
-
}
140
124
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);
-18
sound/soc/intel/boards/sof_sdw_cs42l43.c
-18
sound/soc/intel/boards/sof_sdw_cs42l43.c
···
108
108
return ret;
109
109
}
110
110
111
-
int sof_sdw_cs42l43_hs_init(struct snd_soc_card *card, const struct snd_soc_acpi_link_adr *link,
112
-
struct snd_soc_dai_link *dai_links, struct sof_sdw_codec_info *info,
113
-
bool playback)
114
-
{
115
-
/*
116
-
* No need to test if (!playback) like other codecs as cs42l43 uses separated dai for
117
-
* playback and capture, and sof_sdw_cs42l43_init is only linked to the playback dai.
118
-
*/
119
-
120
-
return 0;
121
-
}
122
-
123
111
int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
124
112
{
125
113
struct snd_soc_card *card = rtd->card;
···
133
145
return ret;
134
146
}
135
147
136
-
int sof_sdw_cs42l43_dmic_init(struct snd_soc_card *card, const struct snd_soc_acpi_link_adr *link,
137
-
struct snd_soc_dai_link *dai_links, struct sof_sdw_codec_info *info,
138
-
bool playback)
139
-
{
140
-
return 0;
141
-
}
-16
sound/soc/intel/boards/sof_sdw_rt5682.c
-16
sound/soc/intel/boards/sof_sdw_rt5682.c
···
120
120
121
121
return ret;
122
122
}
123
-
124
-
int sof_sdw_rt5682_init(struct snd_soc_card *card,
125
-
const struct snd_soc_acpi_link_adr *link,
126
-
struct snd_soc_dai_link *dai_links,
127
-
struct sof_sdw_codec_info *info,
128
-
bool playback)
129
-
{
130
-
/*
131
-
* headset should be initialized once.
132
-
* Do it with dai link for playback.
133
-
*/
134
-
if (!playback)
135
-
return 0;
136
-
137
-
return 0;
138
-
}
139
123
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);
-16
sound/soc/intel/boards/sof_sdw_rt700.c
-16
sound/soc/intel/boards/sof_sdw_rt700.c
···
119
119
120
120
return ret;
121
121
}
122
-
123
-
int sof_sdw_rt700_init(struct snd_soc_card *card,
124
-
const struct snd_soc_acpi_link_adr *link,
125
-
struct snd_soc_dai_link *dai_links,
126
-
struct sof_sdw_codec_info *info,
127
-
bool playback)
128
-
{
129
-
/*
130
-
* headset should be initialized once.
131
-
* Do it with dai link for playback.
132
-
*/
133
-
if (!playback)
134
-
return 0;
135
-
136
-
return 0;
137
-
}
138
122
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);
-18
sound/soc/intel/boards/sof_sdw_rt712_sdca.c
-18
sound/soc/intel/boards/sof_sdw_rt712_sdca.c
···
67
67
return ret;
68
68
}
69
69
70
-
int sof_sdw_rt712_spk_init(struct snd_soc_card *card,
71
-
const struct snd_soc_acpi_link_adr *link,
72
-
struct snd_soc_dai_link *dai_links,
73
-
struct sof_sdw_codec_info *info,
74
-
bool playback)
75
-
{
76
-
return 0;
77
-
}
78
-
79
70
static const char * const dmics[] = {
80
71
"rt712-sdca-dmic"
81
72
};
···
88
97
if (!card->components)
89
98
return -ENOMEM;
90
99
91
-
return 0;
92
-
}
93
-
94
-
int sof_sdw_rt712_sdca_dmic_init(struct snd_soc_card *card,
95
-
const struct snd_soc_acpi_link_adr *link,
96
-
struct snd_soc_dai_link *dai_links,
97
-
struct sof_sdw_codec_info *info,
98
-
bool playback)
99
-
{
100
100
return 0;
101
101
}
102
102
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);
-8
sound/soc/intel/boards/sof_sdw_rt715.c
-8
sound/soc/intel/boards/sof_sdw_rt715.c
-8
sound/soc/intel/boards/sof_sdw_rt715_sdca.c
-8
sound/soc/intel/boards/sof_sdw_rt715_sdca.c