Commit b42c93d8 authored by Damien Le Moal's avatar Damien Le Moal Committed by Wentao Guan
Browse files

ata: sata_sil: Rename sil_blacklist to sil_quirks 

stable inclusion
from stable-v6.6.55
commit 29d2d5eda3936034c961e7ed691d171a63ce46f8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0MX4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=29d2d5eda3936034c961e7ed691d171a63ce46f8



--------------------------------

[ Upstream commit 93b0f9e11ce511353c65b7f924cf5f95bd9c3aba ]

Rename the array sil_blacklist to sil_quirks as this name is more
neutral and is also consistent with how this driver define quirks with
the SIL_QUIRK_XXX flags.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarNiklas Cassel <cassel@kernel.org>
Reviewed-by: default avatarIgor Pylypiv <ipylypiv@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 29d2d5eda3936034c961e7ed691d171a63ce46f8)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent e242e0d0

drivers/ata/sata_sil.c

+6 −6
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static const struct pci_device_id sil_pci_tbl[] = { 
static const struct sil_drivelist {

	const char *product;

	unsigned int quirk;

} sil_blacklist [] = {

} sil_quirks[] = {

	{ "ST320012AS",		SIL_QUIRK_MOD15WRITE },

	{ "ST330013AS",		SIL_QUIRK_MOD15WRITE },

	{ "ST340017AS",		SIL_QUIRK_MOD15WRITE },
@@ -600,8 +600,8 @@ static void sil_thaw(struct ata_port *ap) 
 *	list, and apply the fixups to only the specific

 *	devices/hosts/firmwares that need it.

 *

 *	20040111 - Seagate drives affected by the Mod15Write bug are blacklisted

 *	The Maxtor quirk is in the blacklist, but I'm keeping the original

 *	20040111 - Seagate drives affected by the Mod15Write bug are quirked

 *	The Maxtor quirk is in sil_quirks, but I'm keeping the original

 *	pessimistic fix for the following reasons...

 *	- There seems to be less info on it, only one device gleaned off the

 *	Windows	driver, maybe only one is affected.  More info would be greatly
@@ -620,9 +620,9 @@ static void sil_dev_config(struct ata_device *dev) 


	ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));



	for (n = 0; sil_blacklist[n].product; n++)

		if (!strcmp(sil_blacklist[n].product, model_num)) {

			quirks = sil_blacklist[n].quirk;

	for (n = 0; sil_quirks[n].product; n++)

		if (!strcmp(sil_quirks[n].product, model_num)) {

			quirks = sil_quirks[n].quirk;

			break;

		}