Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Jon Mason
and committed by
Jiri Kosina
54ebfd57
5e2698df
+2
-38
+2
-3
drivers/scsi/megaraid.c
+2
-3
drivers/scsi/megaraid.c
···
305
305
306
306
adapter->host->sg_tablesize = adapter->sglen;
307
307
308
-
309
308
/* use HP firmware and bios version encoding
310
309
Note: fw_version[0|1] and bios_version[0|1] were originally shifted
311
310
right 8 bits making them zero. This 0 value was hardcoded to fix
312
311
sparse warnings. */
313
-
if (adapter->product_info.subsysvid == HP_SUBSYS_VID) {
312
+
if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) {
314
313
sprintf (adapter->fw_version, "%c%d%d.%d%d",
315
314
adapter->product_info.fw_version[2],
316
315
0,
···
4715
4716
* support, since this firmware cannot handle 64 bit
4716
4717
* addressing
4717
4718
*/
4718
-
if ((subsysvid == HP_SUBSYS_VID) &&
4719
+
if ((subsysvid == PCI_VENDOR_ID_HP) &&
4719
4720
((subsysid == 0x60E7) || (subsysid == 0x60E8))) {
4720
4721
/*
4721
4722
* which firmware
-35
drivers/scsi/megaraid.h
-35
drivers/scsi/megaraid.h
···
45
45
46
46
#define MAX_DEV_TYPE 32
47
47
48
-
#ifndef PCI_VENDOR_ID_LSI_LOGIC
49
-
#define PCI_VENDOR_ID_LSI_LOGIC 0x1000
50
-
#endif
51
-
52
-
#ifndef PCI_VENDOR_ID_AMI
53
-
#define PCI_VENDOR_ID_AMI 0x101E
54
-
#endif
55
-
56
-
#ifndef PCI_VENDOR_ID_DELL
57
-
#define PCI_VENDOR_ID_DELL 0x1028
58
-
#endif
59
-
60
-
#ifndef PCI_VENDOR_ID_INTEL
61
-
#define PCI_VENDOR_ID_INTEL 0x8086
62
-
#endif
63
-
64
-
#ifndef PCI_DEVICE_ID_AMI_MEGARAID
65
-
#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010
66
-
#endif
67
-
68
-
#ifndef PCI_DEVICE_ID_AMI_MEGARAID2
69
-
#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060
70
-
#endif
71
-
72
-
#ifndef PCI_DEVICE_ID_AMI_MEGARAID3
73
-
#define PCI_DEVICE_ID_AMI_MEGARAID3 0x1960
74
-
#endif
75
-
76
48
#define PCI_DEVICE_ID_DISCOVERY 0x000E
77
49
#define PCI_DEVICE_ID_PERC4_DI 0x000F
78
50
#define PCI_DEVICE_ID_PERC4_QC_VERDE 0x0407
79
-
80
-
/* Sub-System Vendor IDs */
81
-
#define AMI_SUBSYS_VID 0x101E
82
-
#define DELL_SUBSYS_VID 0x1028
83
-
#define HP_SUBSYS_VID 0x103C
84
-
#define LSI_SUBSYS_VID 0x1000
85
-
#define INTEL_SUBSYS_VID 0x8086
86
51
87
52
#define HBA_SIGNATURE 0x3344
88
53
#define HBA_SIGNATURE_471 0xCCCC