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

Commit f8b01eb9 authored by Mike Miller's avatar Mike Miller Committed by James Bottomley
Browse files

[SCSI] hpsa: add pci ids for storageworks 1210m, remove p400, p800, p700m 



and update pci_ids.h to include new PCI ID for StorageWorks 1210m variant.

Signed-off-by: default avatarMike Miller <mikem@beardog.cce.hp.com>
Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 303932fd

drivers/scsi/hpsa.c

+5 −6
Original line number Diff line number Diff line
@@ -77,9 +77,6 @@ MODULE_PARM_DESC(hpsa_allow_any, 


/* define the PCI info for the cards we can control */

static const struct pci_device_id hpsa_pci_device_id[] = {

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3223},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3234},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x323D},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3241},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3243},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},
@@ -87,6 +84,9 @@ static const struct pci_device_id hpsa_pci_device_id[] = { 
	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3249},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324a},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324b},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3233},

#define PCI_DEVICE_ID_HP_CISSF 0x333f

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x333F},

	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,             PCI_ANY_ID, PCI_ANY_ID,

		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},

	{0,}
@@ -99,9 +99,6 @@ MODULE_DEVICE_TABLE(pci, hpsa_pci_device_id); 
 *  access = Address of the struct of function pointers

 */

static struct board_type products[] = {

	{0x3223103C, "Smart Array P800", &SA5_access},

	{0x3234103C, "Smart Array P400", &SA5_access},

	{0x323d103c, "Smart Array P700M", &SA5_access},

	{0x3241103C, "Smart Array P212", &SA5_access},

	{0x3243103C, "Smart Array P410", &SA5_access},

	{0x3245103C, "Smart Array P410i", &SA5_access},
@@ -109,6 +106,8 @@ static struct board_type products[] = { 
	{0x3249103C, "Smart Array P812", &SA5_access},

	{0x324a103C, "Smart Array P712m", &SA5_access},

	{0x324b103C, "Smart Array P711m", &SA5_access},

	{0x3233103C, "StorageWorks P1210m", &SA5_access},

	{0x333F103C, "StorageWorks P1210m", &SA5_access},

	{0xFFFF103C, "Unknown Smart Array", &SA5_access},

};