drivers/net/r6040.c: Eliminate double sizeof

[linux-2.6-omap-h63xx.git] / drivers / net / r6040.c

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 24f42d23156cdef8f5a9186ffe8bd01995c0143d..504a48ff73c83e5cbac2eaa96c25bdc754bbd40e 100644 (file)
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -61,7 +61,6 @@
 
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT     (6000 * HZ / 1000)
-#define TIMER_WUT      (jiffies + HZ * 1)/* timer wakeup time : 1 second */
 
 /* RDC MAC I/O Size */
 #define R6040_IO_SIZE  256
@@ -174,7 +173,6 @@ struct r6040_private {
        struct net_device *dev;
        struct mii_if_info mii_if;
        struct napi_struct napi;
-       u16     napi_rx_running;
        void __iomem *base;
 };
 
@@ -241,7 +239,8 @@ static void r6040_free_txbufs(struct net_device *dev)
 
        for (i = 0; i < TX_DCNT; i++) {
                if (lp->tx_insert_ptr->skb_ptr) {
-                       pci_unmap_single(lp->pdev, lp->tx_insert_ptr->buf,
+                       pci_unmap_single(lp->pdev,
+                               le32_to_cpu(lp->tx_insert_ptr->buf),
                                MAX_BUF_SIZE, PCI_DMA_TODEVICE);
                        dev_kfree_skb(lp->tx_insert_ptr->skb_ptr);
                        lp->rx_insert_ptr->skb_ptr = NULL;
@@ -257,7 +256,8 @@ static void r6040_free_rxbufs(struct net_device *dev)
 
        for (i = 0; i < RX_DCNT; i++) {
                if (lp->rx_insert_ptr->skb_ptr) {
-                       pci_unmap_single(lp->pdev, lp->rx_insert_ptr->buf,
+                       pci_unmap_single(lp->pdev,
+                               le32_to_cpu(lp->rx_insert_ptr->buf),
                                MAX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(lp->rx_insert_ptr->skb_ptr);
                        lp->rx_insert_ptr->skb_ptr = NULL;
@@ -266,19 +266,6 @@ static void r6040_free_rxbufs(struct net_device *dev)
        }
 }
 
-static void r6040_tx_timeout(struct net_device *dev)
-{
-       struct r6040_private *priv = netdev_priv(dev);
-
-       disable_irq(dev->irq);
-       napi_disable(&priv->napi);
-       spin_lock(&priv->lock);
-       dev->stats.tx_errors++;
-       spin_unlock(&priv->lock);
-
-       netif_stop_queue(dev);
-}
-
 static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring,
                                 dma_addr_t desc_dma, int size)
 {
@@ -286,7 +273,7 @@ static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring,
        dma_addr_t mapping = desc_dma;
 
        while (size-- > 0) {
-               mapping += sizeof(sizeof(*desc));
+               mapping += sizeof(*desc);
                desc->ndesc = cpu_to_le32(mapping);
                desc->vndescp = desc + 1;
                desc++;
@@ -304,7 +291,7 @@ static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev)
 
        descptr = lp->rx_insert_ptr;
        while (lp->rx_free_desc < RX_DCNT) {
-               descptr->skb_ptr = dev_alloc_skb(MAX_BUF_SIZE);
+               descptr->skb_ptr = netdev_alloc_skb(dev, MAX_BUF_SIZE);
 
                if (!descptr->skb_ptr)
                        break;
@@ -350,6 +337,34 @@ static void r6040_alloc_rxbufs(struct net_device *dev)
        iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1);
 }
 
+static void r6040_tx_timeout(struct net_device *dev)
+{
+       struct r6040_private *priv = netdev_priv(dev);
+       void __iomem *ioaddr = priv->base;
+
+       printk(KERN_WARNING "%s: transmit timed out, status %4.4x, PHY status "
+               "%4.4x\n",
+               dev->name, ioread16(ioaddr + MIER),
+               mdio_read(dev, priv->mii_if.phy_id, MII_BMSR));
+
+       disable_irq(dev->irq);
+       napi_disable(&priv->napi);
+       spin_lock(&priv->lock);
+       /* Clear all descriptors */
+       r6040_free_txbufs(dev);
+       r6040_free_rxbufs(dev);
+       r6040_alloc_txbufs(dev);
+       r6040_alloc_rxbufs(dev);
+
+       /* Reset MAC */
+       iowrite16(MAC_RST, ioaddr + MCR1);
+       spin_unlock(&priv->lock);
+       enable_irq(dev->irq);
+
+       dev->stats.tx_errors++;
+       netif_wake_queue(dev);
+}
+
 static struct net_device_stats *r6040_get_stats(struct net_device *dev)
 {
        struct r6040_private *priv = netdev_priv(dev);
@@ -529,7 +544,7 @@ static int r6040_rx(struct net_device *dev, int limit)
                        skb_ptr->dev = priv->dev;
                        /* Do not count the CRC */
                        skb_put(skb_ptr, descptr->len - 4);
-                       pci_unmap_single(priv->pdev, descptr->buf,
+                       pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
                                MAX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                        skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev);
                        /* Send to upper layer */
@@ -570,9 +585,9 @@ static void r6040_tx(struct net_device *dev)
                        dev->stats.tx_carrier_errors++;
 
                if (descptr->status & 0x8000)
-                       break; /* Not complte */
+                       break; /* Not complete */
                skb_ptr = descptr->skb_ptr;
-               pci_unmap_single(priv->pdev, descptr->buf,
+               pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
                        skb_ptr->len, PCI_DMA_TODEVICE);
                /* Free buffer */
                dev_kfree_skb_irq(skb_ptr);
@@ -613,7 +628,6 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
        struct r6040_private *lp = netdev_priv(dev);
        void __iomem *ioaddr = lp->base;
        u16 status;
-       int handled = 1;
 
        /* Mask off RDC MAC interrupt */
        iowrite16(MSK_INT, ioaddr + MIER);
@@ -633,7 +647,7 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
        if (status & 0x10)
                r6040_tx(dev);
 
-       return IRQ_RETVAL(handled);
+       return IRQ_HANDLED;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -719,8 +733,7 @@ static void r6040_timer(unsigned long data)
        }
 
        /* Timer active again */
-       lp->timer.expires = TIMER_WUT;
-       add_timer(&lp->timer);
+       mod_timer(&lp->timer, round_jiffies(jiffies + HZ));
 }
 
 /* Read/set MAC address routines */
@@ -776,14 +789,10 @@ static int r6040_open(struct net_device *dev)
        napi_enable(&lp->napi);
        netif_start_queue(dev);
 
-       if (lp->switch_sig != ICPLUS_PHY_ID) {
-               /* set and active a timer process */
-               init_timer(&lp->timer);
-               lp->timer.expires = TIMER_WUT;
-               lp->timer.data = (unsigned long)dev;
-               lp->timer.function = &r6040_timer;
-               add_timer(&lp->timer);
-       }
+       /* set and active a timer process */
+       setup_timer(&lp->timer, r6040_timer, (unsigned long) dev);
+       if (lp->switch_sig != ICPLUS_PHY_ID)
+               mod_timer(&lp->timer, jiffies + HZ);
        return 0;
 }