Skip to content

Commit 3ae944b

Browse files
hkallweitdavem330
authored andcommitted
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>
1 parent 0800d88 commit 3ae944b

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

drivers/net/fddi/skfp/drvfbi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "h/supern_2.h"
2121
#include "h/skfbiinc.h"
2222
#include <linux/bitrev.h>
23-
#include <linux/pci_regs.h>
23+
#include <linux/pci.h>
2424

2525
#ifndef lint
2626
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)
112112
*/
113113
outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_ON) ; /* enable for writes */
114114
word = inpw(PCI_C(PCI_STATUS)) ;
115-
outpw(PCI_C(PCI_STATUS), word | PCI_ERRBITS) ;
115+
outpw(PCI_C(PCI_STATUS), word | PCI_STATUS_ERROR_BITS);
116116
outp(ADDR(B0_TST_CTRL), TST_CFG_WRITE_OFF) ; /* disable writes */
117117

118118
/*

drivers/net/fddi/skfp/h/skfbi.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
*/
3434
#define I2C_ADDR_VPD 0xA0 /* I2C address for the VPD EEPROM */
3535

36-
37-
#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)
38-
39-
40-
4136
/*
4237
* Control Register File:
4338
* Bank 0

0 commit comments

Comments
 (0)