Commit ef1429c0 authored by Damien Le Moal's avatar Damien Le Moal
Browse files

ata: libata-core: cleanup ata_device_blacklist 



Remove the unneeded comma after the last field of the array entries.

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent ec194bdb

drivers/ata/libata-core.c

+49 −49
Original line number Diff line number Diff line
@@ -3898,7 +3898,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	/* Devices where NCQ should be avoided */

	/* NCQ is slow */

	{ "WDC WD740ADFD-00",	NULL,		ATA_HORKAGE_NONCQ },

	{ "WDC WD740ADFD-00NLR1", NULL,		ATA_HORKAGE_NONCQ, },

	{ "WDC WD740ADFD-00NLR1", NULL,		ATA_HORKAGE_NONCQ },

	/* http://thread.gmane.org/gmane.linux.ide/14907 */

	{ "FUJITSU MHT2060BH",	NULL,		ATA_HORKAGE_NONCQ },

	/* NCQ is broken */
@@ -3924,23 +3924,23 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	/* drives which fail FPDMA_AA activation (some may freeze afterwards)

	   the ST disks also have LPM issues */

	{ "ST1000LM024 HN-M101MBB", NULL,	ATA_HORKAGE_BROKEN_FPDMA_AA |

						ATA_HORKAGE_NOLPM, },

						ATA_HORKAGE_NOLPM },

	{ "VB0250EAVER",	"HPG7",		ATA_HORKAGE_BROKEN_FPDMA_AA },



	/* Blacklist entries taken from Silicon Image 3124/3132

	   Windows driver .inf file - also several Linux problem reports */

	{ "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },

	{ "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ, },

	{ "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ, },

	{ "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ },

	{ "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ },

	{ "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ },



	/* https://bugzilla.kernel.org/show_bug.cgi?id=15573 */

	{ "C300-CTFDDAC128MAG",	"0001",		ATA_HORKAGE_NONCQ, },

	{ "C300-CTFDDAC128MAG",	"0001",		ATA_HORKAGE_NONCQ },



	/* Sandisk SD7/8/9s lock up hard on large trims */

	{ "SanDisk SD[789]*",	NULL,		ATA_HORKAGE_MAX_TRIM_128M, },

	{ "SanDisk SD[789]*",	NULL,		ATA_HORKAGE_MAX_TRIM_128M },



	/* devices which puke on READ_NATIVE_MAX */

	{ "HDS724040KLSA80",	"KFAOA20N",	ATA_HORKAGE_BROKEN_HPA, },

	{ "HDS724040KLSA80",	"KFAOA20N",	ATA_HORKAGE_BROKEN_HPA },

	{ "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA },

	{ "WDC WD2500JD-00HBB0", "WD-WMAL71490727", ATA_HORKAGE_BROKEN_HPA },

	{ "MAXTOR 6L080L4",	"A93.0500",	ATA_HORKAGE_BROKEN_HPA },
@@ -3949,22 +3949,22 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "OCZ-VERTEX",		    "1.30",	ATA_HORKAGE_BROKEN_HPA },



	/* Devices which report 1 sector over size HPA */

	{ "ST340823A",		NULL,		ATA_HORKAGE_HPA_SIZE, },

	{ "ST320413A",		NULL,		ATA_HORKAGE_HPA_SIZE, },

	{ "ST310211A",		NULL,		ATA_HORKAGE_HPA_SIZE, },

	{ "ST340823A",		NULL,		ATA_HORKAGE_HPA_SIZE },

	{ "ST320413A",		NULL,		ATA_HORKAGE_HPA_SIZE },

	{ "ST310211A",		NULL,		ATA_HORKAGE_HPA_SIZE },



	/* Devices which get the IVB wrong */

	{ "QUANTUM FIREBALLlct10 05", "A03.0900", ATA_HORKAGE_IVB, },

	{ "QUANTUM FIREBALLlct10 05", "A03.0900", ATA_HORKAGE_IVB },

	/* Maybe we should just blacklist TSSTcorp... */

	{ "TSSTcorp CDDVDW SH-S202[HJN]", "SB0[01]",  ATA_HORKAGE_IVB, },

	{ "TSSTcorp CDDVDW SH-S202[HJN]", "SB0[01]",  ATA_HORKAGE_IVB },



	/* Devices that do not need bridging limits applied */

	{ "MTRON MSP-SATA*",		NULL,	ATA_HORKAGE_BRIDGE_OK, },

	{ "BUFFALO HD-QSU2/R5",		NULL,	ATA_HORKAGE_BRIDGE_OK, },

	{ "MTRON MSP-SATA*",		NULL,	ATA_HORKAGE_BRIDGE_OK },

	{ "BUFFALO HD-QSU2/R5",		NULL,	ATA_HORKAGE_BRIDGE_OK },



	/* Devices which aren't very happy with higher link speeds */

	{ "WD My Book",			NULL,	ATA_HORKAGE_1_5_GBPS, },

	{ "Seagate FreeAgent GoFlex",	NULL,	ATA_HORKAGE_1_5_GBPS, },

	{ "WD My Book",			NULL,	ATA_HORKAGE_1_5_GBPS },

	{ "Seagate FreeAgent GoFlex",	NULL,	ATA_HORKAGE_1_5_GBPS },



	/*

	 * Devices which choke on SETXFER.  Applies only if both the
@@ -3982,57 +3982,57 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	/* 512GB MX100 with MU01 firmware has both queued TRIM and LPM issues */

	{ "Crucial_CT512MX100*",	"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NOLPM, },

						ATA_HORKAGE_NOLPM },

	/* 512GB MX100 with newer firmware has only LPM issues */

	{ "Crucial_CT512MX100*",	NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NOLPM, },

						ATA_HORKAGE_NOLPM },



	/* 480GB+ M500 SSDs have both queued TRIM and LPM issues */

	{ "Crucial_CT480M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NOLPM, },

						ATA_HORKAGE_NOLPM },

	{ "Crucial_CT960M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NOLPM, },

						ATA_HORKAGE_NOLPM },



	/* These specific Samsung models/firmware-revs do not handle LPM well */

	{ "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, },

	{ "SAMSUNG SSD PM830 mSATA *",  "CXM13D1Q", ATA_HORKAGE_NOLPM, },

	{ "SAMSUNG MZ7TD256HAFV-000L9", NULL,       ATA_HORKAGE_NOLPM, },

	{ "SAMSUNG MZ7TE512HMHP-000L1", "EXT06L0Q", ATA_HORKAGE_NOLPM, },

	{ "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM },

	{ "SAMSUNG SSD PM830 mSATA *",  "CXM13D1Q", ATA_HORKAGE_NOLPM },

	{ "SAMSUNG MZ7TD256HAFV-000L9", NULL,       ATA_HORKAGE_NOLPM },

	{ "SAMSUNG MZ7TE512HMHP-000L1", "EXT06L0Q", ATA_HORKAGE_NOLPM },



	/* devices that don't properly handle queued TRIM commands */

	{ "Micron_M500IT_*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Micron_M500_*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Crucial_CT*M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Micron_M5[15]0_*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Crucial_CT*M550*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Samsung SSD 840 EVO*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_NO_DMA_LOG |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Samsung SSD 840*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Samsung SSD 850*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Samsung SSD 860*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NO_NCQ_ON_ATI, },

						ATA_HORKAGE_NO_NCQ_ON_ATI },

	{ "Samsung SSD 870*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NO_NCQ_ON_ATI, },

						ATA_HORKAGE_NO_NCQ_ON_ATI },

	{ "FCCT*M500*",			NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM },



	/* devices that don't properly handle TRIM commands */

	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM, },

	{ "M88V29*",			NULL,	ATA_HORKAGE_NOTRIM, },

	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM },

	{ "M88V29*",			NULL,	ATA_HORKAGE_NOTRIM },



	/*

	 * As defined, the DRAT (Deterministic Read After Trim) and RZAT
@@ -4050,16 +4050,16 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	 * The intel 510 drive has buggy DRAT/RZAT. Explicitly exclude

	 * that model before whitelisting all other intel SSDs.

	 */

	{ "INTEL*SSDSC2MH*",		NULL,	0, },

	{ "INTEL*SSDSC2MH*",		NULL,	0 },



	{ "Micron*",			NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Crucial*",			NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "INTEL*SSD*", 		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "SSD*INTEL*",			NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung*SSD*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "SAMSUNG*SSD*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "SAMSUNG*MZ7KM*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "ST[1248][0248]0[FH]*",	NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Micron*",			NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Crucial*",			NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "INTEL*SSD*", 		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "SSD*INTEL*",			NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "Samsung*SSD*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "SAMSUNG*SSD*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "SAMSUNG*MZ7KM*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },

	{ "ST[1248][0248]0[FH]*",	NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM },



	/*

	 * Some WD SATA-I drives spin up and down erratically when the link