From: Junio C Hamano <junkio@cox.net>
Date: Mon, 9 Jul 2007 21:17:57 +0000 (+0200)
Subject: ide_in_drive_list(): "ALL" is not a wildcard anymore
X-Git-Tag: v2.6.23-rc1~1214
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f3577db0c294ab4ce8460a8003312474b509e95f;p=linux-2.6-omap-h63xx.git

ide_in_drive_list(): "ALL" is not a wildcard anymore

This removes the support to treat "ALL" as a wildcard for
firmware revision.  This is made a separate patch, as it will
break out-of-tree ide drivers that feed its own table that uses
"ALL" as the wildcard to ide_in_drive_list().

Signed-off-by: Junio C Hamano <junkio@cox.net>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index e80f8e1a0b9..85db8e85443 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -148,7 +148,6 @@ int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *driv
 	for ( ; drive_table->id_model ; drive_table++)
 		if ((!strcmp(drive_table->id_model, id->model)) &&
 		    (!drive_table->id_firmware ||
-		     !strcmp(drive_table->id_firmware, "ALL") || /* to be removed later */
 		     strstr(id->fw_rev, drive_table->id_firmware)))
 			return 1;
 	return 0;