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>

diff --git a/drivers/net/ethernet/marvell/skge.h b/drivers/net/ethernet/marvell/skge.h
index 8ef19b3aa8fff47ac40c94c2476730111f5f4753..6928abcec0a3f59c309f2d3dd4d5c0d1079aa68d 100644 (file)
--- a/drivers/net/ethernet/marvell/skge.h
+++ b/drivers/net/ethernet/marvell/skge.h
@@ -15,13 +15,6 @@
 #define  PCI_VPD_ROM_SZ        7L<<14  /* VPD ROM size 0=256, 1=512, ... */
 #define  PCI_REV_DESC  1<<2    /* Reverse Descriptor bytes */
 
-#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
-                              PCI_STATUS_SIG_SYSTEM_ERROR | \
-                              PCI_STATUS_REC_MASTER_ABORT | \
-                              PCI_STATUS_REC_TARGET_ABORT | \
-                              PCI_STATUS_SIG_TARGET_ABORT | \
-                              PCI_STATUS_PARITY)
-
 enum csr_regs {
        B0_RAP  = 0x0000,
        B0_CTST = 0x0004,

diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
index 2474d326319eb58fcf4aa9590218d70b843955e5..b2dddd8a246c8971fa429ceb6c22ffea3a183e0d 100644 (file)
--- a/drivers/net/ethernet/marvell/sky2.h
+++ b/drivers/net/ethernet/marvell/sky2.h
@@ -252,13 +252,6 @@ enum {
 };
 
 
-#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
-                              PCI_STATUS_SIG_SYSTEM_ERROR | \
-                              PCI_STATUS_REC_MASTER_ABORT | \
-                              PCI_STATUS_REC_TARGET_ABORT | \
-                              PCI_STATUS_SIG_TARGET_ABORT | \
-                              PCI_STATUS_PARITY)
-
 enum csr_regs {
        B0_RAP          = 0x0000,
        B0_CTST         = 0x0004,

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 3840a541a9de521aa69755f859776c48c36543e2..101d71e0ad0d73d0db0d60ac72e643f596ae4dc6 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -42,6 +42,13 @@
 
 #include <linux/pci_ids.h>
 
+#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY  | \
+                              PCI_STATUS_SIG_SYSTEM_ERROR | \
+                              PCI_STATUS_REC_MASTER_ABORT | \
+                              PCI_STATUS_REC_TARGET_ABORT | \
+                              PCI_STATUS_SIG_TARGET_ABORT | \
+                              PCI_STATUS_PARITY)
+
 /*
  * The PCI interface treats multi-function devices as independent
  * devices.  The slot/function address of each device is encoded