aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Lord <kernel@teksavvy.com>2010-07-01 18:17:21 -0400
committerJeff Garzik <jgarzik@redhat.com>2010-08-01 19:36:03 -0400
commitdbaf5083bf07a1c14b15828a3aac92f0ce11543c (patch)
treeda174c5c94bba5372ceebb4253f977f41fd2a582 /drivers
parentbce036cea10a8dd21eb8c9bf1b641d8790429c8e (diff)
libata: reduce blacklist size (v2)
Take advantage of the new glob_match() function to reduce the blacklist size somewhat. There are further savings possible, but these are the most obvious biggies. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/libata-core.c60
1 files changed, 6 insertions, 54 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f8c72a1867fd..af02ff36cf2b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4211,70 +4211,22 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
4211 { "OCZ CORE_SSD", "02.10104", ATA_HORKAGE_NONCQ }, 4211 { "OCZ CORE_SSD", "02.10104", ATA_HORKAGE_NONCQ },
4212 4212
4213 /* Seagate NCQ + FLUSH CACHE firmware bug */ 4213 /* Seagate NCQ + FLUSH CACHE firmware bug */
4214 { "ST31500341AS", "SD15", ATA_HORKAGE_NONCQ | 4214 { "ST31500341AS", "SD1[56789]", ATA_HORKAGE_NONCQ |
4215 ATA_HORKAGE_FIRMWARE_WARN },
4216 { "ST31500341AS", "SD16", ATA_HORKAGE_NONCQ |
4217 ATA_HORKAGE_FIRMWARE_WARN },
4218 { "ST31500341AS", "SD17", ATA_HORKAGE_NONCQ |
4219 ATA_HORKAGE_FIRMWARE_WARN },
4220 { "ST31500341AS", "SD18", ATA_HORKAGE_NONCQ |
4221 ATA_HORKAGE_FIRMWARE_WARN },
4222 { "ST31500341AS", "SD19", ATA_HORKAGE_NONCQ |
4223 ATA_HORKAGE_FIRMWARE_WARN }, 4215 ATA_HORKAGE_FIRMWARE_WARN },
4224 4216
4225 { "ST31000333AS", "SD15", ATA_HORKAGE_NONCQ | 4217 { "ST31000333AS", "SD1[56789]", ATA_HORKAGE_NONCQ |
4226 ATA_HORKAGE_FIRMWARE_WARN },
4227 { "ST31000333AS", "SD16", ATA_HORKAGE_NONCQ |
4228 ATA_HORKAGE_FIRMWARE_WARN },
4229 { "ST31000333AS", "SD17", ATA_HORKAGE_NONCQ |
4230 ATA_HORKAGE_FIRMWARE_WARN },
4231 { "ST31000333AS", "SD18", ATA_HORKAGE_NONCQ |
4232 ATA_HORKAGE_FIRMWARE_WARN },
4233 { "ST31000333AS", "SD19", ATA_HORKAGE_NONCQ |
4234 ATA_HORKAGE_FIRMWARE_WARN }, 4218 ATA_HORKAGE_FIRMWARE_WARN },
4235 4219
4236 { "ST3640623AS", "SD15", ATA_HORKAGE_NONCQ | 4220 { "ST3640623AS", "SD1[56789]", ATA_HORKAGE_NONCQ |
4237 ATA_HORKAGE_FIRMWARE_WARN },
4238 { "ST3640623AS", "SD16", ATA_HORKAGE_NONCQ |
4239 ATA_HORKAGE_FIRMWARE_WARN },
4240 { "ST3640623AS", "SD17", ATA_HORKAGE_NONCQ |
4241 ATA_HORKAGE_FIRMWARE_WARN },
4242 { "ST3640623AS", "SD18", ATA_HORKAGE_NONCQ |
4243 ATA_HORKAGE_FIRMWARE_WARN },
4244 { "ST3640623AS", "SD19", ATA_HORKAGE_NONCQ |
4245 ATA_HORKAGE_FIRMWARE_WARN }, 4221 ATA_HORKAGE_FIRMWARE_WARN },
4246 4222
4247 { "ST3640323AS", "SD15", ATA_HORKAGE_NONCQ | 4223 { "ST3640323AS", "SD1[56789]", ATA_HORKAGE_NONCQ |
4248 ATA_HORKAGE_FIRMWARE_WARN },
4249 { "ST3640323AS", "SD16", ATA_HORKAGE_NONCQ |
4250 ATA_HORKAGE_FIRMWARE_WARN },
4251 { "ST3640323AS", "SD17", ATA_HORKAGE_NONCQ |
4252 ATA_HORKAGE_FIRMWARE_WARN },
4253 { "ST3640323AS", "SD18", ATA_HORKAGE_NONCQ |
4254 ATA_HORKAGE_FIRMWARE_WARN },
4255 { "ST3640323AS", "SD19", ATA_HORKAGE_NONCQ |
4256 ATA_HORKAGE_FIRMWARE_WARN }, 4224 ATA_HORKAGE_FIRMWARE_WARN },
4257 4225
4258 { "ST3320813AS", "SD15", ATA_HORKAGE_NONCQ | 4226 { "ST3320813AS", "SD1[56789]", ATA_HORKAGE_NONCQ |
4259 ATA_HORKAGE_FIRMWARE_WARN },
4260 { "ST3320813AS", "SD16", ATA_HORKAGE_NONCQ |
4261 ATA_HORKAGE_FIRMWARE_WARN },
4262 { "ST3320813AS", "SD17", ATA_HORKAGE_NONCQ |
4263 ATA_HORKAGE_FIRMWARE_WARN },
4264 { "ST3320813AS", "SD18", ATA_HORKAGE_NONCQ |
4265 ATA_HORKAGE_FIRMWARE_WARN },
4266 { "ST3320813AS", "SD19", ATA_HORKAGE_NONCQ |
4267 ATA_HORKAGE_FIRMWARE_WARN }, 4227 ATA_HORKAGE_FIRMWARE_WARN },
4268 4228
4269 { "ST3320613AS", "SD15", ATA_HORKAGE_NONCQ | 4229 { "ST3320613AS", "SD1[56789]", ATA_HORKAGE_NONCQ |
4270 ATA_HORKAGE_FIRMWARE_WARN },
4271 { "ST3320613AS", "SD16", ATA_HORKAGE_NONCQ |
4272 ATA_HORKAGE_FIRMWARE_WARN },
4273 { "ST3320613AS", "SD17", ATA_HORKAGE_NONCQ |
4274 ATA_HORKAGE_FIRMWARE_WARN },
4275 { "ST3320613AS", "SD18", ATA_HORKAGE_NONCQ |
4276 ATA_HORKAGE_FIRMWARE_WARN },
4277 { "ST3320613AS", "SD19", ATA_HORKAGE_NONCQ |
4278 ATA_HORKAGE_FIRMWARE_WARN }, 4230 ATA_HORKAGE_FIRMWARE_WARN },
4279 4231
4280 /* Blacklist entries taken from Silicon Image 3124/3132 4232 /* Blacklist entries taken from Silicon Image 3124/3132