Skip to content

Commit a7ee5b4

Browse files
committed
SoC: SOF: Intel: FIx device descriptions (missing
Merge series from Peter Ujfalusi <[email protected]>: We have recently noticed that the ops_free callback was missed for the device descriptions on Intel platforms.
2 parents e45cd86 + 376f79b commit a7ee5b4

File tree

6 files changed

+14
-0
lines changed

6 files changed

+14
-0
lines changed

sound/soc/sof/intel/pci-apl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ static const struct sof_dev_desc glk_desc = {
7878
.nocodec_tplg_filename = "sof-glk-nocodec.tplg",
7979
.ops = &sof_apl_ops,
8080
.ops_init = sof_apl_ops_init,
81+
.ops_free = hda_ops_free,
8182
};
8283

8384
/* PCI IDs */

sound/soc/sof/intel/pci-cnl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ static const struct sof_dev_desc cnl_desc = {
4848
.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
4949
.ops = &sof_cnl_ops,
5050
.ops_init = sof_cnl_ops_init,
51+
.ops_free = hda_ops_free,
5152
};
5253

5354
static const struct sof_dev_desc cfl_desc = {
@@ -111,6 +112,7 @@ static const struct sof_dev_desc cml_desc = {
111112
.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
112113
.ops = &sof_cnl_ops,
113114
.ops_init = sof_cnl_ops_init,
115+
.ops_free = hda_ops_free,
114116
};
115117

116118
/* PCI IDs */

sound/soc/sof/intel/pci-icl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ static const struct sof_dev_desc jsl_desc = {
7979
.nocodec_tplg_filename = "sof-jsl-nocodec.tplg",
8080
.ops = &sof_cnl_ops,
8181
.ops_init = sof_cnl_ops_init,
82+
.ops_free = hda_ops_free,
8283
};
8384

8485
/* PCI IDs */

sound/soc/sof/intel/pci-mtl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ static const struct sof_dev_desc mtl_desc = {
4646
.nocodec_tplg_filename = "sof-mtl-nocodec.tplg",
4747
.ops = &sof_mtl_ops,
4848
.ops_init = sof_mtl_ops_init,
49+
.ops_free = hda_ops_free,
4950
};
5051

5152
/* PCI IDs */

sound/soc/sof/intel/pci-skl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ static struct sof_dev_desc skl_desc = {
3838
.nocodec_tplg_filename = "sof-skl-nocodec.tplg",
3939
.ops = &sof_skl_ops,
4040
.ops_init = sof_skl_ops_init,
41+
.ops_free = hda_ops_free,
4142
};
4243

4344
static struct sof_dev_desc kbl_desc = {
@@ -61,6 +62,7 @@ static struct sof_dev_desc kbl_desc = {
6162
.nocodec_tplg_filename = "sof-kbl-nocodec.tplg",
6263
.ops = &sof_skl_ops,
6364
.ops_init = sof_skl_ops_init,
65+
.ops_free = hda_ops_free,
6466
};
6567

6668
/* PCI IDs */

sound/soc/sof/intel/pci-tgl.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ static const struct sof_dev_desc tgl_desc = {
4848
.nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
4949
.ops = &sof_tgl_ops,
5050
.ops_init = sof_tgl_ops_init,
51+
.ops_free = hda_ops_free,
5152
};
5253

5354
static const struct sof_dev_desc tglh_desc = {
@@ -110,6 +111,7 @@ static const struct sof_dev_desc ehl_desc = {
110111
.nocodec_tplg_filename = "sof-ehl-nocodec.tplg",
111112
.ops = &sof_tgl_ops,
112113
.ops_init = sof_tgl_ops_init,
114+
.ops_free = hda_ops_free,
113115
};
114116

115117
static const struct sof_dev_desc adls_desc = {
@@ -141,6 +143,7 @@ static const struct sof_dev_desc adls_desc = {
141143
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
142144
.ops = &sof_tgl_ops,
143145
.ops_init = sof_tgl_ops_init,
146+
.ops_free = hda_ops_free,
144147
};
145148

146149
static const struct sof_dev_desc adl_desc = {
@@ -172,6 +175,7 @@ static const struct sof_dev_desc adl_desc = {
172175
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
173176
.ops = &sof_tgl_ops,
174177
.ops_init = sof_tgl_ops_init,
178+
.ops_free = hda_ops_free,
175179
};
176180

177181
static const struct sof_dev_desc adl_n_desc = {
@@ -203,6 +207,7 @@ static const struct sof_dev_desc adl_n_desc = {
203207
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
204208
.ops = &sof_tgl_ops,
205209
.ops_init = sof_tgl_ops_init,
210+
.ops_free = hda_ops_free,
206211
};
207212

208213
static const struct sof_dev_desc rpls_desc = {
@@ -234,6 +239,7 @@ static const struct sof_dev_desc rpls_desc = {
234239
.nocodec_tplg_filename = "sof-rpl-nocodec.tplg",
235240
.ops = &sof_tgl_ops,
236241
.ops_init = sof_tgl_ops_init,
242+
.ops_free = hda_ops_free,
237243
};
238244

239245
static const struct sof_dev_desc rpl_desc = {
@@ -265,6 +271,7 @@ static const struct sof_dev_desc rpl_desc = {
265271
.nocodec_tplg_filename = "sof-rpl-nocodec.tplg",
266272
.ops = &sof_tgl_ops,
267273
.ops_init = sof_tgl_ops_init,
274+
.ops_free = hda_ops_free,
268275
};
269276

270277
/* PCI IDs */

0 commit comments

Comments
 (0)