[libata] update blacklist for new hyphenated pattern ranges (v2)

Take further advantage of the new glob_match() function to reduce
the blacklist size, this time making use of "character ranges" in
the patterns.

Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index eefb948f0632..a0a4d6968400 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4209,22 +4209,16 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "OCZ CORE_SSD",       "02.10104",     ATA_HORKAGE_NONCQ },
 
         /* Seagate NCQ + FLUSH CACHE firmware bug */
-        { "ST31500341AS",       "SD1[56789]",   ATA_HORKAGE_NONCQ |
+        { "ST31500341AS",       "SD1[5-9]",     ATA_HORKAGE_NONCQ |
                                                 ATA_HORKAGE_FIRMWARE_WARN },
 
-        { "ST31000333AS",       "SD1[56789]",   ATA_HORKAGE_NONCQ |
+        { "ST31000333AS",       "SD1[5-9]",     ATA_HORKAGE_NONCQ |
                                                 ATA_HORKAGE_FIRMWARE_WARN },
 
-        { "ST3640623AS",        "SD1[56789]",   ATA_HORKAGE_NONCQ |
+        { "ST3640[36]23AS",     "SD1[5-9]",     ATA_HORKAGE_NONCQ |
                                                 ATA_HORKAGE_FIRMWARE_WARN },
 
-        { "ST3640323AS",        "SD1[56789]",   ATA_HORKAGE_NONCQ |
-                                                ATA_HORKAGE_FIRMWARE_WARN },
-
-        { "ST3320813AS",        "SD1[56789]",   ATA_HORKAGE_NONCQ |
-                                                ATA_HORKAGE_FIRMWARE_WARN },
-
-        { "ST3320613AS",        "SD1[56789]",   ATA_HORKAGE_NONCQ |
+        { "ST3320[68]13AS",     "SD1[5-9]",     ATA_HORKAGE_NONCQ |
                                                 ATA_HORKAGE_FIRMWARE_WARN },
 
         /* Blacklist entries taken from Silicon Image 3124/3132