From: Cezary Rojewski Date: Wed, 14 Aug 2024 08:39:29 +0000 (+0200) Subject: ASoC: Intel: avs: Enable by default for all SST configurations X-Git-Tag: v6.12-rc1~169^2~1^2~73^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=526139aff1d14c5a2cc0a769c063f439444c61c2;p=thirdparty%2Flinux.git ASoC: Intel: avs: Enable by default for all SST configurations The skylake-driver is deprecated in favour of the avs-driver. As the latter supports all configurations of its predecessor and more, update the existing selection mechanism to acknowledge the SST flag. Acked-by: Andy Shevchenko Signed-off-by: Cezary Rojewski Link: https://patch.msgid.link/20240814083929.1217319-15-cezary.rojewski@intel.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index f2dc82a2abc71..da7bac09acb4e 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -422,8 +422,14 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) int ret; ret = snd_intel_dsp_driver_probe(pci); - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_AVS) + switch (ret) { + case SND_INTEL_DSP_DRIVER_ANY: + case SND_INTEL_DSP_DRIVER_SST: + case SND_INTEL_DSP_DRIVER_AVS: + break; + default: return -ENODEV; + } ret = pcim_enable_device(pci); if (ret < 0)