diff options
| author | Mark Brown <broonie@kernel.org> | 2019-08-08 23:20:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-08 23:20:45 +0100 |
| commit | c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 (patch) | |
| tree | 60f4851429a445366de41c73798afcde0cc5c28c /sound/soc/sof/intel/hda.c | |
| parent | f6326fa4855b0f8173af822fcc139afdbf4d4b71 (diff) | |
| parent | d4ff1b3917a529bdc75592af6b1504ad6c4029f7 (diff) | |
| download | linux-c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6.tar.gz linux-c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6.tar.bz2 linux-c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6.zip | |
Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4
Diffstat (limited to 'sound/soc/sof/intel/hda.c')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 53813de7844e..d04844d6b104 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -242,7 +242,6 @@ static int hda_init(struct snd_sof_dev *sdev) { struct hda_bus *hbus; struct hdac_bus *bus; - struct hdac_ext_bus_ops *ext_ops = NULL; struct pci_dev *pci = to_pci_dev(sdev->dev); int ret; @@ -250,10 +249,7 @@ static int hda_init(struct snd_sof_dev *sdev) bus = sof_to_bus(sdev); /* HDA bus init */ -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) - ext_ops = snd_soc_hdac_hda_get_ops(); -#endif - sof_hda_bus_init(bus, &pci->dev, ext_ops); + sof_hda_bus_init(bus, &pci->dev); /* Workaround for a communication error on CFL (bko#199007) and CNL */ if (IS_CFL(pci) || IS_CNL(pci)) |