ASoC: rt5645: Drop double EF20 entry from dmi_platform_data[]
authorHans de Goede <hdegoede@redhat.com>
Sun, 26 Nov 2023 21:40:18 +0000 (22:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 23:35:39 +0000 (15:35 -0800)
[ Upstream commit 51add1687f39292af626ac3c2046f49241713273 ]

dmi_platform_data[] first contains a DMI entry matching:

   DMI_MATCH(DMI_PRODUCT_NAME, "EF20"),

and then contains an identical entry except for the match being:

   DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),

Since these are partial (non exact) DMI matches the first match
will also match any board with "EF20EA" in their DMI product-name,
drop the second, redundant, entry.

Fixes: a4dae468cfdd ("ASoC: rt5645: Add ACPI-defined GPIO for ECS EF20 series")
Cc: Chris Chiu <chiu@endlessos.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://msgid.link/r/20231126214024.300505-2-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/rt5645.c

index a0d01d7..edcb85b 100644 (file)
@@ -3854,14 +3854,6 @@ static const struct dmi_system_id dmi_platform_data[] = {
                },
                .driver_data = (void *)&ecs_ef20_platform_data,
        },
-       {
-               .ident = "EF20EA",
-               .callback = cht_rt5645_ef20_quirk_cb,
-               .matches = {
-                       DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
-               },
-               .driver_data = (void *)&ecs_ef20_platform_data,
-       },
        { }
 };