From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Jie Yang <yang.jie@linux.intel.com>,
alsa-devel@alsa-project.org
Subject: [PATCH v2 9/9] ASoC: Intel: Switch DMI table match to a test of variable
Date: Mon, 20 Jan 2020 18:08:01 +0200 [thread overview]
Message-ID: <20200120160801.53089-10-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200120160801.53089-1-andriy.shevchenko@linux.intel.com>
Since we have a common x86 quirk that provides an exported variable,
use it instead of local DMI table match.
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
.../intel/common/soc-acpi-intel-cht-match.c | 33 ++-----------------
1 file changed, 3 insertions(+), 30 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..c35766125d5e 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 <linux/dmi.h>
+#include <linux/platform_data/x86/machine.h>
+
#include <sound/soc-acpi.h>
#include <sound/soc-acpi-intel-match.h>
-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",
@@ -41,14 +21,7 @@ static struct snd_soc_acpi_mach cht_surface_mach = {
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)
- return &cht_surface_mach;
- else
- return mach;
+ return x86_microsoft_surface_3_machine ? &cht_surface_mach : arg;
}
/* Cherryview-based platforms: CherryTrail and Braswell */
--
2.24.1
next prev parent reply other threads:[~2020-01-20 16:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 16:07 [PATCH v2 0/9] x86: Easy way of detecting MS Surface 3 Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 1/9] x86/platform: Rename x86/apple.h -> x86/machine.h Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 2/9] x86/quirks: Add missed include to satisfy static checker Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 3/9] x86/quirks: Introduce hpet_dev_print_force_hpet_address() helper Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 4/9] x86/quirks: Join string literals back Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 5/9] x86/quirks: Convert DMI matching to use a table Andy Shevchenko
2020-01-21 11:51 ` Jonathan McDowell
2020-01-21 15:20 ` Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 6/9] x86/quirks: Add a DMI quirk for Microsoft Surface 3 Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 7/9] platform/x86: surface3_wmi: Switch DMI table match to a test of variable Andy Shevchenko
2020-01-20 16:08 ` [PATCH v2 8/9] ASoC: rt5645: " Andy Shevchenko
2020-01-20 17:46 ` Mark Brown
2020-01-20 16:08 ` Andy Shevchenko [this message]
2020-01-20 17:55 ` [PATCH v2 9/9] ASoC: Intel: " Mark Brown
2020-01-21 15:20 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120160801.53089-10-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=hpa@zytor.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yang.jie@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).