Skip to content

Commit d6e055e

Browse files
hkallweitdavem330
authored andcommitted
PCI: Add constant PCI_STATUS_ERROR_BITS
This collection of PCI error bits is used in more than one driver, so move it to the PCI core. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 90760b2 commit d6e055e

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

drivers/net/ethernet/marvell/skge.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
#define PCI_VPD_ROM_SZ 7L<<14 /* VPD ROM size 0=256, 1=512, ... */
1616
#define PCI_REV_DESC 1<<2 /* Reverse Descriptor bytes */
1717

18-
#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
19-
PCI_STATUS_SIG_SYSTEM_ERROR | \
20-
PCI_STATUS_REC_MASTER_ABORT | \
21-
PCI_STATUS_REC_TARGET_ABORT | \
22-
PCI_STATUS_SIG_TARGET_ABORT | \
23-
PCI_STATUS_PARITY)
24-
2518
enum csr_regs {
2619
B0_RAP = 0x0000,
2720
B0_CTST = 0x0004,

drivers/net/ethernet/marvell/sky2.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,6 @@ enum {
252252
};
253253

254254

255-
#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
256-
PCI_STATUS_SIG_SYSTEM_ERROR | \
257-
PCI_STATUS_REC_MASTER_ABORT | \
258-
PCI_STATUS_REC_TARGET_ABORT | \
259-
PCI_STATUS_SIG_TARGET_ABORT | \
260-
PCI_STATUS_PARITY)
261-
262255
enum csr_regs {
263256
B0_RAP = 0x0000,
264257
B0_CTST = 0x0004,

include/linux/pci.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@
4242

4343
#include <linux/pci_ids.h>
4444

45+
#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
46+
PCI_STATUS_SIG_SYSTEM_ERROR | \
47+
PCI_STATUS_REC_MASTER_ABORT | \
48+
PCI_STATUS_REC_TARGET_ABORT | \
49+
PCI_STATUS_SIG_TARGET_ABORT | \
50+
PCI_STATUS_PARITY)
51+
4552
/*
4653
* The PCI interface treats multi-function devices as independent
4754
* devices. The slot/function address of each device is encoded

0 commit comments

Comments
 (0)