Commit dee58fe8 authored by Michał Mirosław's avatar Michał Mirosław Committed by Jens Axboe

ata_piix: remove open-coded dmi_match(DMI_OEM_STRING)

Since de40614d ("firmware: dmi_scan: Add DMI_OEM_STRING support to
dmi_matches") dmi_check_system() can match OEM_STRINGs itself.
Use the feature.
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e9f691d8
...@@ -840,6 +840,12 @@ static int piix_broken_suspend(void) ...@@ -840,6 +840,12 @@ static int piix_broken_suspend(void)
DMI_MATCH(DMI_PRODUCT_NAME, "Tecra M3"), DMI_MATCH(DMI_PRODUCT_NAME, "Tecra M3"),
}, },
}, },
{
.ident = "TECRA M3",
.matches = {
DMI_MATCH(DMI_OEM_STRING, "Tecra M3,"),
},
},
{ {
.ident = "TECRA M4", .ident = "TECRA M4",
.matches = { .matches = {
...@@ -955,18 +961,10 @@ static int piix_broken_suspend(void) ...@@ -955,18 +961,10 @@ static int piix_broken_suspend(void)
{ } /* terminate list */ { } /* terminate list */
}; };
static const char *oemstrs[] = {
"Tecra M3,",
};
int i;
if (dmi_check_system(sysids)) if (dmi_check_system(sysids))
return 1; 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 /* TECRA M4 sometimes forgets its identify and reports bogus
* DMI information. As the bogus information is a bit * DMI information. As the bogus information is a bit
* generic, match as many entries as possible. This manual * generic, match as many entries as possible. This manual
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment