net: skfp: use new constant PCI_STATUS_ERROR_BITS

Use new PCI core constant PCI_STATUS_ERROR_BITS to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c
index 9c8aa3a95463eedcc6183367a74f5b9f43f1ba46..cc9ac572423e9d83575c08347a5f5d6b28c5b5fe 100644 (file)
--- a/drivers/net/fddi/skfp/drvfbi.c
+++ b/drivers/net/fddi/skfp/drvfbi.c
@@ -20,7 +20,7 @@
 #include "h/supern_2.h"
 #include "h/skfbiinc.h"
 #include <linux/bitrev.h>
-#include <linux/pci_regs.h>
+#include <linux/pci.h>
 
 #ifndef        lint
 static const char ID_sccs[] = "@(#)drvfbi.c    1.63 99/02/11 (C) SK " ;
@@ -112,7 +112,7 @@ static void card_start(struct s_smc *smc)
         */
        outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_ON) ;     /* enable for writes */
        word = inpw(PCI_C(PCI_STATUS)) ;
-       outpw(PCI_C(PCI_STATUS), word | PCI_ERRBITS) ;
+       outpw(PCI_C(PCI_STATUS), word | PCI_STATUS_ERROR_BITS);
        outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_OFF) ;    /* disable writes */
 
        /*

diff --git a/drivers/net/fddi/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h
index 36e20a5142fe8aa4e6b84dcc7651c10fd7e8fa30..ccee00b71dbc8584307c0d77cc2688ea4a09277c 100644 (file)
--- a/drivers/net/fddi/skfp/h/skfbi.h
+++ b/drivers/net/fddi/skfp/h/skfbi.h
@@ -33,11 +33,6 @@
  */
 #define I2C_ADDR_VPD   0xA0    /* I2C address for the VPD EEPROM */ 
 
-
-#define PCI_ERRBITS    (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)
-
-
-
 /*
  *     Control Register File:
  *     Bank 0