[netdrvr via-rhine] trivial bits:

- nuke mii_status_bits
- move clear_tally_counters() up so it can get inlined (pointed out by
  Luca Barbieri)
- rename via_restart_tx() -> via_rhine_restart_tx()

diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index bce93d192be3b211e24f1da3689829a6b1289d63..fd8e05425c98daf13b42e1b83e1807b75fd21a79 100644 (file)
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -425,20 +425,6 @@ enum intr_status_bits {
        IntrNormalSummary=0x0003, IntrAbnormalSummary=0xC260,
 };
 
-/* MII interface, status flags.
-   Not to be confused with the MIIStatus register ... */
-enum mii_status_bits {
-       MIICap100T4                     = 0x8000,
-       MIICap10100HdFd         = 0x7800,
-       MIIPreambleSupr         = 0x0040,
-       MIIAutoNegCompleted     = 0x0020,
-       MIIRemoteFault          = 0x0010,
-       MIICapAutoNeg           = 0x0008,
-       MIILink                         = 0x0004,
-       MIIJabber                       = 0x0002,
-       MIIExtended                     = 0x0001
-};
-
 /* The Rx and Tx buffer descriptors. */
 struct rx_desc {
        s32 rx_status;
@@ -533,8 +519,6 @@ static void via_rhine_set_rx_mode(struct net_device *dev);
 static struct net_device_stats *via_rhine_get_stats(struct net_device *dev);
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static int  via_rhine_close(struct net_device *dev);
-static inline void clear_tally_counters(long ioaddr);
-static inline void via_restart_tx(struct net_device *dev);
 
 static void wait_for_reset(struct net_device *dev, int chip_id, char *name)
 {
@@ -797,7 +781,7 @@ static int __devinit via_rhine_init_one (struct pci_dev *pdev,
                                           mdio_read(dev, phy, 5));
 
                                /* set IFF_RUNNING */
-                               if (mii_status & MIILink)
+                               if (mii_status & BMSR_LSTATUS)
                                        netif_carrier_on(dev);
                                else
                                        netif_carrier_off(dev);
@@ -1175,8 +1159,8 @@ static void via_rhine_timer(unsigned long data)
 
        /* make IFF_RUNNING follow the MII status bit "Link established" */
        mii_status = mdio_read(dev, np->phys[0], MII_BMSR);
-       if ( (mii_status & MIILink) != (np->mii_status & MIILink) ) {
-               if (mii_status & MIILink)
+       if ( (mii_status & BMSR_LSTATUS) != (np->mii_status & BMSR_LSTATUS) ) {
+               if (mii_status & BMSR_LSTATUS)
                        netif_carrier_on(dev);
                else
                        netif_carrier_off(dev);
@@ -1414,8 +1398,8 @@ static void via_rhine_rx(struct net_device *dev)
        int boguscnt = np->dirty_rx + RX_RING_SIZE - np->cur_rx;
 
        if (debug > 4) {
-               printk(KERN_DEBUG " In via_rhine_rx(), entry %d status %8.8x.\n",
-                          entry, le32_to_cpu(np->rx_head_desc->rx_status));
+               printk(KERN_DEBUG "%s: via_rhine_rx(), entry %d status %8.8x.\n",
+                          dev->name, entry, le32_to_cpu(np->rx_head_desc->rx_status));
        }
 
        /* If EOP is set on the next entry, it's a new packet. Send it up. */
@@ -1521,7 +1505,18 @@ static void via_rhine_rx(struct net_device *dev)
        writew(CmdRxDemand | np->chip_cmd, dev->base_addr + ChipCmd);
 }
 
-static inline void via_restart_tx(struct net_device *dev) {
+/* Clears the "tally counters" for CRC errors and missed frames(?).
+   It has been reported that some chips need a write of 0 to clear
+   these, for others the counters are set to 1 when written to and
+   instead cleared when read. So we clear them both ways ... */
+static inline void clear_tally_counters(const long ioaddr)
+{
+       writel(0, ioaddr + RxMissed);
+       readw(ioaddr + RxCRCErrs);
+       readw(ioaddr + RxMissed);
+}
+
+static inline void via_rhine_restart_tx(struct net_device *dev) {
        struct netdev_private *np = dev->priv;
        int entry = np->dirty_tx % TX_RING_SIZE;
 
@@ -1561,7 +1556,7 @@ static void via_rhine_error(struct net_device *dev, int intr_status)
                if (debug > 1)
                        printk(KERN_INFO "%s: Abort %4.4x, frame dropped.\n",
                                   dev->name, intr_status);
-               via_restart_tx(dev);
+               via_rhine_restart_tx(dev);
        }
        if (intr_status & IntrTxUnderrun) {
                if (np->tx_thresh < 0xE0)
@@ -1570,7 +1565,7 @@ static void via_rhine_error(struct net_device *dev, int intr_status)
                        printk(KERN_INFO "%s: Transmitter underrun, Tx "
                                   "threshold now %2.2x.\n",
                                   dev->name, np->tx_thresh);
-               via_restart_tx(dev);
+               via_rhine_restart_tx(dev);
        }
        if (intr_status & ~( IntrLinkChange | IntrStatsMax |
                                                 IntrTxError | IntrTxAborted | IntrNormalSummary)) {
@@ -1599,17 +1594,6 @@ static struct net_device_stats *via_rhine_get_stats(struct net_device *dev)
        return &np->stats;
 }
 
-/* Clears the "tally counters" for CRC errors and missed frames(?).
-   It has been reported that some chips need a write of 0 to clear
-   these, for others the counters are set to 1 when written to and
-   instead cleared when read. So we clear them both ways ... */
-static inline void clear_tally_counters(const long ioaddr)
-{
-       writel(0, ioaddr + RxMissed);
-       readw(ioaddr + RxCRCErrs);
-       readw(ioaddr + RxMissed);
-}
-
 static void via_rhine_set_rx_mode(struct net_device *dev)
 {
        struct netdev_private *np = dev->priv;