diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2020-02-29 23:27:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-04 14:21:00 -0800 |
| commit | 3ae944b829d697df292b7cfa0240cfc457ef41ce (patch) | |
| tree | f5b1143bcd46be1f9800e061bd18549316ce340a /drivers/net/fddi | |
| parent | 0800d88e2c2c55cf990ec8970419afb0acfb6856 (diff) | |
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>
Diffstat (limited to 'drivers/net/fddi')
| -rw-r--r-- | drivers/net/fddi/skfp/drvfbi.c | 4 | ||||
| -rw-r--r-- | drivers/net/fddi/skfp/h/skfbi.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c index 9c8aa3a95463..cc9ac572423e 100644 --- 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 36e20a5142fe..ccee00b71dbc 100644 --- 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 |