Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ata_piix: remove open-coded dmi_match(DMI_OEM_STRING)

Since de40614de99 ("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: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Michał Mirosław and committed by
Jens Axboe
dee58fe8 e9f691d8

+6 -8
+6 -8
drivers/ata/ata_piix.c
··· 841 841 }, 842 842 }, 843 843 { 844 + .ident = "TECRA M3", 845 + .matches = { 846 + DMI_MATCH(DMI_OEM_STRING, "Tecra M3,"), 847 + }, 848 + }, 849 + { 844 850 .ident = "TECRA M4", 845 851 .matches = { 846 852 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), ··· 961 955 962 956 { } /* terminate list */ 963 957 }; 964 - static const char *oemstrs[] = { 965 - "Tecra M3,", 966 - }; 967 - int i; 968 958 969 959 if (dmi_check_system(sysids)) 970 960 return 1; 971 - 972 - for (i = 0; i < ARRAY_SIZE(oemstrs); i++) 973 - if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL)) 974 - return 1; 975 961 976 962 /* TECRA M4 sometimes forgets its identify and reports bogus 977 963 * DMI information. As the bogus information is a bit