Merge series "ASoC: Intel: machine driver updates for 5.9" from Pierre-Louis Bossart...

[sfrench/cifs-2.6.git] / sound / soc / intel / boards / bytcht_es8316.c

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index ecbc58e8a37f5cb292f951ba62f725c2c41d6800..414ae4bb5224a96d58d2586c2d2d092395ebe988 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -407,8 +407,18 @@ static int byt_cht_es8316_resume(struct snd_soc_card *card)
        return 0;
 }
 
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
+/* use space before codec name to simplify card ID, and simplify driver name */
+#define CARD_NAME "bytcht es8316" /* card name will be 'sof-bytcht es8316' */
+#define DRIVER_NAME "SOF"
+#else
+#define CARD_NAME "bytcht-es8316"
+#define DRIVER_NAME NULL /* card name will be used for driver name */
+#endif
+
 static struct snd_soc_card byt_cht_es8316_card = {
-       .name = "bytcht-es8316",
+       .name = CARD_NAME,
+       .driver_name = DRIVER_NAME,
        .owner = THIS_MODULE,
        .dai_link = byt_cht_es8316_dais,
        .num_links = ARRAY_SIZE(byt_cht_es8316_dais),
@@ -515,9 +525,8 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
                        BYT_CHT_ES8316_MONO_SPEAKER;
        }
        if (quirk_override != -1) {
-               dev_info(dev, "Overriding quirk 0x%x => 0x%x\n",
-                        (unsigned int)quirk,
-                        quirk_override);
+               dev_info(dev, "Overriding quirk 0x%lx => 0x%x\n",
+                        quirk, quirk_override);
                quirk = quirk_override;
        }
        log_quirks(dev);