ASoC: Intel: bytcht_es8316: Add is_bytcr helper variable

Add a is_bytcr helper variable to probe().

This is a preparation patch for determining the quirks through querying
the ACPI Device-Specific-Method (DSM) on the codec-device.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231202123946.54347-4-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index e6ab1ee6ab2993ed4fb984d496d4bde0a0bb4bc2..0d657467831740a7ac92043420f0cb09381376ab 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -471,10 +471,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
        struct byt_cht_es8316_private *priv;
        const struct dmi_system_id *dmi_id;
        struct fwnode_handle *fwnode;
+       bool sof_parent, is_bytcr;
        const char *platform_name;
        struct acpi_device *adev;
        struct device *codec_dev;
-       bool sof_parent;
        unsigned int cnt = 0;
        int dai_index = 0;
        int i;
@@ -524,11 +524,11 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
        es83xx_dsm_dump(priv->codec_dev);
 
        /* Check for BYTCR or other platform and setup quirks */
+       is_bytcr = soc_intel_is_byt() && mach->mach_params.acpi_ipc_irq_index == 0;
        dmi_id = dmi_first_match(byt_cht_es8316_quirk_table);
        if (dmi_id) {
                quirk = (unsigned long)dmi_id->driver_data;
-       } else if (soc_intel_is_byt() &&
-                  mach->mach_params.acpi_ipc_irq_index == 0) {
+       } else if (is_bytcr) {
                /* On BYTCR default to SSP0, internal-mic-in2-map, mono-spk */
                quirk = BYT_CHT_ES8316_SSP0 | BYT_CHT_ES8316_INTMIC_IN2_MAP |
                        BYT_CHT_ES8316_MONO_SPEAKER;