[alsa-devel] [PATCH v1 7/8] ASoC: Intel: Switch DMI table match to a test of variable – Alsa-devel

Since we have a common x86 quirk that provides an exported variable,
use it instead of local DMI table match.

Cc: Cezary Rojewski [email protected]
Cc: Pierre-Louis Bossart [email protected]
Cc: Liam Girdwood [email protected]
Cc: Jie Yang [email protected]
Cc: Mark Brown [email protected]
Cc: [email protected]
Signed-off-by: Andy Shevchenko [email protected]
—
…/intel/common/soc-acpi-intel-cht-match.c | 28 ++—————–
1 file changed, 3 insertions(+), 25 deletions(-)

diff –git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
index d0fb43c2b9f6..833d2e130e6e 100644
— a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
@@ -5,31 +5,11 @@
* Copyright (c) 2017, Intel Corporation.
*/

-#include +#include +
#include
#include

-static unsigned long cht_machine_id;
–
-#define CHT_SURFACE_MACH 1
–
-static int cht_surface_quirk_cb(const struct dmi_system_id *id)
-{
– cht_machine_id = CHT_SURFACE_MACH;
– return 1;
-}
–
-static const struct dmi_system_id cht_table[] = {
– {
– .callback = cht_surface_quirk_cb,
– .matches = {
– DMI_MATCH(DMI_SYS_VENDOR, “Microsoft Corporation”),
– DMI_MATCH(DMI_PRODUCT_NAME, “Surface 3”),
– },
– },
– { }
-};
–
static struct snd_soc_acpi_mach cht_surface_mach = {
.id = “10EC5640”,
.drv_name = “cht-bsw-rt5645”,
@@ -43,9 +23,7 @@ static struct snd_soc_acpi_mach *cht_quirk(void *arg)
{
struct snd_soc_acpi_mach *mach = arg;

– dmi_check_system(cht_table);
–
– if (cht_machine_id == CHT_SURFACE_MACH)
+ if (x86_microsoft_surface_3_machine)
return &cht_surface_mach;
else
return mach;

—
2.24.1