Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-15 18:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DM9000: Remove magic numbers

Browse Source 
Remove magic numbers for items that we already have
defined in the register header file.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Ben Dooks 2008-07-17 20:29:13 +01:00 committed by Jeff Garzik
parent 23fcc8d991
commit f8e5e776a3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/dm9000.c
View File

@ -888,19 +888,22 @@ dm9000_rx(struct net_device *dev)
dev_dbg(db->dev, "RST: RX Len:%x\n", RxLen); dev_dbg(db->dev, "RST: RX Len:%x\n", RxLen);
} }
if (rxhdr.RxStatus & 0xbf) { /* rxhdr.RxStatus is identical to RSR register. */
if (rxhdr.RxStatus & (RSR_FOE | RSR_CE | RSR_AE |
RSR_PLE | RSR_RWTO |
RSR_LCS | RSR_RF)) {
GoodPacket = false; GoodPacket = false;
if (rxhdr.RxStatus & 0x01) { if (rxhdr.RxStatus & RSR_FOE) {
if (netif_msg_rx_err(db)) if (netif_msg_rx_err(db))
dev_dbg(db->dev, "fifo error\n"); dev_dbg(db->dev, "fifo error\n");
dev->stats.rx_fifo_errors++; dev->stats.rx_fifo_errors++;
} }
if (rxhdr.RxStatus & 0x02) { if (rxhdr.RxStatus & RSR_CE) {
if (netif_msg_rx_err(db)) if (netif_msg_rx_err(db))
dev_dbg(db->dev, "crc error\n"); dev_dbg(db->dev, "crc error\n");
dev->stats.rx_crc_errors++; dev->stats.rx_crc_errors++;
} }
if (rxhdr.RxStatus & 0x80) { if (rxhdr.RxStatus & RSR_RF) {
if (netif_msg_rx_err(db)) if (netif_msg_rx_err(db))
dev_dbg(db->dev, "length error\n"); dev_dbg(db->dev, "length error\n");
dev->stats.rx_length_errors++; dev->stats.rx_length_errors++;
@ -1067,7 +1070,7 @@ dm9000_phy_read(struct net_device *dev, int phy_reg_unused, int reg)
/* Fill the phyxcer register into REG_0C */ /* Fill the phyxcer register into REG_0C */
iow(db, DM9000_EPAR, DM9000_PHY | reg); iow(db, DM9000_EPAR, DM9000_PHY | reg);
iow(db, DM9000_EPCR, 0xc); /* Issue phyxcer read command */ iow(db, DM9000_EPCR, EPCR_ERPRR | EPCR_EPOS); /* Issue phyxcer read command */
writeb(reg_save, db->io_addr); writeb(reg_save, db->io_addr);
spin_unlock_irqrestore(&db->lock,flags); spin_unlock_irqrestore(&db->lock,flags);
@ -1118,7 +1121,7 @@ dm9000_phy_write(struct net_device *dev,
iow(db, DM9000_EPDRL, value); iow(db, DM9000_EPDRL, value);
iow(db, DM9000_EPDRH, value >> 8); iow(db, DM9000_EPDRH, value >> 8);
iow(db, DM9000_EPCR, 0xa); /* Issue phyxcer write command */ iow(db, DM9000_EPCR, EPCR_EPOS | EPCR_ERPRW); /* Issue phyxcer write command */
writeb(reg_save, db->io_addr); writeb(reg_save, db->io_addr);
spin_unlock_irqrestore(&db->lock, flags); spin_unlock_irqrestore(&db->lock, flags);