hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

megaraid: remove unnecessary #defines 

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

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Jon Mason 2012-07-10 15:31:28 -07:00 committed by Jiri Kosina
parent 5e2698df75
commit 54ebfd5781
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/megaraid.c
View File

@ -305,12 +305,11 @@ mega_query_adapter(adapter_t *adapter)
adapter->host->sg_tablesize = adapter->sglen; adapter->host->sg_tablesize = adapter->sglen;
/* use HP firmware and bios version encoding /* use HP firmware and bios version encoding
Note: fw_version[0|1] and bios_version[0|1] were originally shifted 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 right 8 bits making them zero. This 0 value was hardcoded to fix
sparse warnings. */ 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", sprintf (adapter->fw_version, "%c%d%d.%d%d",
adapter->product_info.fw_version[2], adapter->product_info.fw_version[2],
0, 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 * support, since this firmware cannot handle 64 bit
* addressing * addressing
*/ */
if ((subsysvid == HP_SUBSYS_VID) && if ((subsysvid == PCI_VENDOR_ID_HP) &&
((subsysid == 0x60E7) || (subsysid == 0x60E8))) { ((subsysid == 0x60E7) || (subsysid == 0x60E8))) {
/* /*
* which firmware * which firmware

35
drivers/scsi/megaraid.h
View File

@ -45,45 +45,10 @@
#define MAX_DEV_TYPE 32 #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_DISCOVERY 0x000E
#define PCI_DEVICE_ID_PERC4_DI 0x000F #define PCI_DEVICE_ID_PERC4_DI 0x000F
#define PCI_DEVICE_ID_PERC4_QC_VERDE 0x0407 #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 0x3344
#define HBA_SIGNATURE_471 0xCCCC #define HBA_SIGNATURE_471 0xCCCC
#define HBA_SIGNATURE_64BIT 0x0299 #define HBA_SIGNATURE_64BIT 0x0299