diff options
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 4ba72933f0da..cc7d46238801 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -662,7 +662,7 @@ static const struct ethtool_ops rtl8139_ethtool_ops; | |||
662 | /* read MMIO register */ | 662 | /* read MMIO register */ |
663 | #define RTL_R8(reg) ioread8 (ioaddr + (reg)) | 663 | #define RTL_R8(reg) ioread8 (ioaddr + (reg)) |
664 | #define RTL_R16(reg) ioread16 (ioaddr + (reg)) | 664 | #define RTL_R16(reg) ioread16 (ioaddr + (reg)) |
665 | #define RTL_R32(reg) ((unsigned long) ioread32 (ioaddr + (reg))) | 665 | #define RTL_R32(reg) ioread32 (ioaddr + (reg)) |
666 | 666 | ||
667 | 667 | ||
668 | static const u16 rtl8139_intr_mask = | 668 | static const u16 rtl8139_intr_mask = |
@@ -861,7 +861,7 @@ retry: | |||
861 | 861 | ||
862 | /* if unknown chip, assume array element #0, original RTL-8139 in this case */ | 862 | /* if unknown chip, assume array element #0, original RTL-8139 in this case */ |
863 | dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n"); | 863 | dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n"); |
864 | dev_dbg(&pdev->dev, "TxConfig = 0x%lx\n", RTL_R32 (TxConfig)); | 864 | dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig)); |
865 | tp->chipset = 0; | 865 | tp->chipset = 0; |
866 | 866 | ||
867 | match: | 867 | match: |
@@ -1642,7 +1642,7 @@ static void rtl8139_tx_timeout_task (struct work_struct *work) | |||
1642 | netdev_dbg(dev, "Tx queue start entry %ld dirty entry %ld\n", | 1642 | netdev_dbg(dev, "Tx queue start entry %ld dirty entry %ld\n", |
1643 | tp->cur_tx, tp->dirty_tx); | 1643 | tp->cur_tx, tp->dirty_tx); |
1644 | for (i = 0; i < NUM_TX_DESC; i++) | 1644 | for (i = 0; i < NUM_TX_DESC; i++) |
1645 | netdev_dbg(dev, "Tx descriptor %d is %08lx%s\n", | 1645 | netdev_dbg(dev, "Tx descriptor %d is %08x%s\n", |
1646 | i, RTL_R32(TxStatus0 + (i * 4)), | 1646 | i, RTL_R32(TxStatus0 + (i * 4)), |
1647 | i == tp->dirty_tx % NUM_TX_DESC ? | 1647 | i == tp->dirty_tx % NUM_TX_DESC ? |
1648 | " (queue head)" : ""); | 1648 | " (queue head)" : ""); |
@@ -2486,7 +2486,7 @@ static void __set_rx_mode (struct net_device *dev) | |||
2486 | int rx_mode; | 2486 | int rx_mode; |
2487 | u32 tmp; | 2487 | u32 tmp; |
2488 | 2488 | ||
2489 | netdev_dbg(dev, "rtl8139_set_rx_mode(%04x) done -- Rx config %08lx\n", | 2489 | netdev_dbg(dev, "rtl8139_set_rx_mode(%04x) done -- Rx config %08x\n", |
2490 | dev->flags, RTL_R32(RxConfig)); | 2490 | dev->flags, RTL_R32(RxConfig)); |
2491 | 2491 | ||
2492 | /* Note: do not reorder, GCC is clever about common statements. */ | 2492 | /* Note: do not reorder, GCC is clever about common statements. */ |