Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7517b26c authored by Leonid Moiseichuk's avatar Leonid Moiseichuk Committed by Martin K. Petersen
Browse files

mvsas: Generalize Marvell 9485 in pci_device_id 



Claim Marvell 9485 controllers regardless of subdevice ID.

Tested on ASUS P9A-I/C2550/SAS/4L which uses vendor-specific 1043:8635.

[mkp: Tweaked commit message]

Signed-off-by: default avatarLeonid Moiseichuk <leonid.moiseichuk@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 63f21677

drivers/scsi/mvsas/mv_init.c

+1 −18
Original line number Original line Diff line number Diff line
@@ -704,24 +704,7 @@ static struct pci_device_id mvs_pci_table[] = { 
		.class_mask	= 0,

		.class_mask	= 0,

		.driver_data	= chip_9445,

		.driver_data	= chip_9445,

	},

	},

	{

	{ PCI_VDEVICE(MARVELL_EXT, 0x9485), chip_9485 }, /* Marvell 9480/9485 (any vendor/model) */

		.vendor		= PCI_VENDOR_ID_MARVELL_EXT,

		.device		= 0x9485,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= 0x9480,

		.class		= 0,

		.class_mask	= 0,

		.driver_data	= chip_9485,

	},

	{

		.vendor		= PCI_VENDOR_ID_MARVELL_EXT,

		.device		= 0x9485,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= 0x9485,

		.class		= 0,

		.class_mask	= 0,

		.driver_data	= chip_9485,

	},

	{ PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */

	{ PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */

	{ PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */

	{ PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */

	{ PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */

	{ PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */