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

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

[SCSI] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF 



PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as 3fff in
hpsa.c. The ID of 3fff will _never_ ship as a standalone controller. It is
intended only as part a complete storage solution. As such, this patch
removes the redefinition and the StorageWorks P1210m from the product table.

It also removes a duplicate line for the "unknown" controller support.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 13d38d9d

drivers/scsi/hpsa.c

+1 −7
Original line number Diff line number Diff line
@@ -90,12 +90,8 @@ static const struct pci_device_id hpsa_pci_device_id[] = { 
	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3252},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3253},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3254},

#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},

	{PCI_VENDOR_ID_COMPAQ,     PCI_ANY_ID,             PCI_ANY_ID, PCI_ANY_ID,

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

	{0,}

};
@@ -113,8 +109,6 @@ 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},

	{0x3250103C, "Smart Array", &SA5_access},

	{0x3250113C, "Smart Array", &SA5_access},

	{0x3250123C, "Smart Array", &SA5_access},