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

Commit 54ebfd57 authored by Jon Mason's avatar Jon Mason Committed by Jiri Kosina
Browse files

megaraid: remove unnecessary #defines 



Remove PCI vendor and subvendor IDs, as they are already defined in
pci_ids.h.

Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 5e2698df

drivers/scsi/megaraid.c

+2 −3
Original line number Diff line number Diff line
@@ -305,12 +305,11 @@ mega_query_adapter(adapter_t *adapter) 


	adapter->host->sg_tablesize = adapter->sglen;





	/* use HP firmware and bios version encoding

	   Note: fw_version[0|1] and bios_version[0|1] were originally shifted

	   right 8 bits making them zero. This 0 value was hardcoded to fix

	   sparse warnings. */

	if (adapter->product_info.subsysvid == HP_SUBSYS_VID) {

	if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) {

		sprintf (adapter->fw_version, "%c%d%d.%d%d",

			 adapter->product_info.fw_version[2],

			 0,
@@ -4716,7 +4715,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	 * support, since this firmware cannot handle 64 bit

	 * addressing

	 */

	if ((subsysvid == HP_SUBSYS_VID) &&

	if ((subsysvid == PCI_VENDOR_ID_HP) &&

	    ((subsysid == 0x60E7) || (subsysid == 0x60E8))) {

		/*

		 * which firmware

drivers/scsi/megaraid.h

+0 −35
Original line number Diff line number Diff line
@@ -45,45 +45,10 @@ 


#define MAX_DEV_TYPE	32



#ifndef PCI_VENDOR_ID_LSI_LOGIC

#define PCI_VENDOR_ID_LSI_LOGIC		0x1000

#endif



#ifndef PCI_VENDOR_ID_AMI

#define PCI_VENDOR_ID_AMI		0x101E

#endif



#ifndef PCI_VENDOR_ID_DELL

#define PCI_VENDOR_ID_DELL		0x1028

#endif



#ifndef PCI_VENDOR_ID_INTEL

#define PCI_VENDOR_ID_INTEL		0x8086

#endif



#ifndef PCI_DEVICE_ID_AMI_MEGARAID

#define PCI_DEVICE_ID_AMI_MEGARAID	0x9010

#endif



#ifndef PCI_DEVICE_ID_AMI_MEGARAID2

#define PCI_DEVICE_ID_AMI_MEGARAID2	0x9060

#endif



#ifndef PCI_DEVICE_ID_AMI_MEGARAID3

#define PCI_DEVICE_ID_AMI_MEGARAID3	0x1960

#endif



#define PCI_DEVICE_ID_DISCOVERY		0x000E

#define PCI_DEVICE_ID_PERC4_DI		0x000F

#define PCI_DEVICE_ID_PERC4_QC_VERDE	0x0407



/* Sub-System Vendor IDs */

#define	AMI_SUBSYS_VID			0x101E

#define DELL_SUBSYS_VID			0x1028

#define	HP_SUBSYS_VID			0x103C

#define LSI_SUBSYS_VID			0x1000

#define INTEL_SUBSYS_VID		0x8086



#define HBA_SIGNATURE	      		0x3344

#define HBA_SIGNATURE_471	  	0xCCCC

#define HBA_SIGNATURE_64BIT		0x0299