[RESEND] ata_piix: remove open-coded dmi_match(DMI_OEM_STRING)
diff mbox series

Message ID a47522045d251146c8f7daaeb18a32716bfc3397.1573097536.git.mirq-linux@rere.qmqm.pl
State Accepted
Commit dee58fe8dc57dfd5a760ad05c3526787f832ad78
Headers show
Series
  • [RESEND] ata_piix: remove open-coded dmi_match(DMI_OEM_STRING)
Related show

Commit Message

Michał Mirosław Nov. 7, 2019, 3:32 a.m. UTC
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>
---
 drivers/ata/ata_piix.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Comments

Jens Axboe Nov. 7, 2019, 3:35 a.m. UTC | #1
On 11/6/19 8:32 PM, Michał Mirosław wrote:
> Since de40614de99 ("firmware: dmi_scan: Add DMI_OEM_STRING support to
> dmi_matches") dmi_check_system() can match OEM_STRINGs itself.
> Use the feature.

Looks good, applied, thanks.

Patch
diff mbox series

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e4da725381d3..3ca7720e7d8f 100644
--- 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