ACPI: EC: Drop unused ident initializers from dmi_system_id tables

Drop the unused const string ident initializers from
the dmi_system_id tables to make the object size a bit smaller.

While at it also use proper named struct-member initializers for
the ec_dmi_table[].

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 337c6bb6897b7cf0b13d4f01993c4f411dcb9352..c95e535035a04adaed3d88b954655dbf23859dd2 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1858,18 +1858,38 @@ static int ec_honor_dsdt_gpe(const struct dmi_system_id *id)
 
 static const struct dmi_system_id ec_dmi_table[] __initconst = {
        {
-       ec_correct_ecdt, "MSI MS-171F", {
-       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star"),
-       DMI_MATCH(DMI_PRODUCT_NAME, "MS-171F"),}, NULL},
+               /*
+                * MSI MS-171F
+                * https://bugzilla.kernel.org/show_bug.cgi?id=12461
+                */
+               .callback = ec_correct_ecdt,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MS-171F"),
+               },
+       },
        {
-       /* https://bugzilla.kernel.org/show_bug.cgi?id=209989 */
-       ec_honor_dsdt_gpe, "HP Pavilion Gaming Laptop 15-cx0xxx", {
-       DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-cx0xxx"),}, NULL},
+               /*
+                * HP Pavilion Gaming Laptop 15-cx0xxx
+                * https://bugzilla.kernel.org/show_bug.cgi?id=209989
+                */
+               .callback = ec_honor_dsdt_gpe,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-cx0xxx"),
+               },
+       },
        {
-       ec_clear_on_resume, "Samsung hardware", {
-       DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD.")}, NULL},
-       {},
+               /*
+                * Samsung hardware
+                * https://bugzilla.kernel.org/show_bug.cgi?id=44161
+                */
+               .callback = ec_clear_on_resume,
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+               },
+       },
+       {}
 };
 
 void __init acpi_ec_ecdt_probe(void)
@@ -2147,21 +2167,18 @@ static int acpi_ec_init_workqueues(void)
 
 static const struct dmi_system_id acpi_ec_no_wakeup[] = {
        {
-               .ident = "Thinkpad X1 Carbon 6th",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
                        DMI_MATCH(DMI_PRODUCT_FAMILY, "Thinkpad X1 Carbon 6th"),
                },
        },
        {
-               .ident = "ThinkPad X1 Yoga 3rd",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
                        DMI_MATCH(DMI_PRODUCT_FAMILY, "ThinkPad X1 Yoga 3rd"),
                },
        },
        {
-               .ident = "HP ZHAN 66 Pro",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "HP"),
                        DMI_MATCH(DMI_PRODUCT_FAMILY, "103C_5336AN HP ZHAN 66 Pro"),