aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-07-09 17:17:57 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-07-09 17:17:57 -0400
commitf3577db0c294ab4ce8460a8003312474b509e95f (patch)
treebcebdc1236375767ef5f514e5727771a224f413c /drivers/ide
parentbb53cfe9fa21c4f875d5c9470865fbbd0657804e (diff)
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-dma.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index e80f8e1a0b93..85db8e85443a 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
148 for ( ; drive_table->id_model ; drive_table++) 148 for ( ; drive_table->id_model ; drive_table++)
149 if ((!strcmp(drive_table->id_model, id->model)) && 149 if ((!strcmp(drive_table->id_model, id->model)) &&
150 (!drive_table->id_firmware || 150 (!drive_table->id_firmware ||
151 !strcmp(drive_table->id_firmware, "ALL") || /* to be removed later */
152 strstr(id->fw_rev, drive_table->id_firmware))) 151 strstr(id->fw_rev, drive_table->id_firmware)))
153 return 1; 152 return 1;
154 return 0; 153 return 0;