ata_piix: remove open-coded dmi_match(DMI_OEM_STRING)

[sfrench/cifs-2.6.git] / drivers / ata / ata_piix.c

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e4da725381d31b773f2b44df1c55dded7722b154..3ca7720e7d8fba57b3bfa2daf0c5951fdde430d9 100644 (file)
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -840,6 +840,12 @@ static int piix_broken_suspend(void)
                                DMI_MATCH(DMI_PRODUCT_NAME, "Tecra M3"),
                        },
                },
+               {
+                       .ident = "TECRA M3",
+                       .matches = {
+                               DMI_MATCH(DMI_OEM_STRING, "Tecra M3,"),
+                       },
+               },
                {
                        .ident = "TECRA M4",
                        .matches = {
@@ -955,18 +961,10 @@ static int piix_broken_suspend(void)
 
                { }     /* terminate list */
        };
-       static const char *oemstrs[] = {
-               "Tecra M3,",
-       };
-       int i;
 
        if (dmi_check_system(sysids))
                return 1;
 
-       for (i = 0; i < ARRAY_SIZE(oemstrs); i++)
-               if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL))
-                       return 1;
-
        /* TECRA M4 sometimes forgets its identify and reports bogus
         * DMI information.  As the bogus information is a bit
         * generic, match as many entries as possible.  This manual