diff options
| author | Florian Fainelli <florian.fainelli@telecomint.eu> | 2007-12-12 23:13:15 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2008-02-05 23:29:22 +0100 |
| commit | ec6d2d453a932fd50c5fd95d5aac633b4e5f241d (patch) | |
| tree | 2112d2ddbe9d5944242d6a8723c86ec67c52083b /drivers | |
| parent | 106adf3c84d081776a1d1fbb8a047cad12af2bb9 (diff) | |
| download | op-kernel-dev-ec6d2d453a932fd50c5fd95d5aac633b4e5f241d.zip op-kernel-dev-ec6d2d453a932fd50c5fd95d5aac633b4e5f241d.tar.gz | |
r6040: cleanups
- use netdev_alloc_skb
- remove an useless variable in the IRQ handler
- remove an unused private structure member
- fix a spelling mistake
Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/r6040.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 7ca6a93..19184e4 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -173,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; }; @@ -290,7 +289,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; @@ -584,7 +583,7 @@ 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, skb_ptr->len, PCI_DMA_TODEVICE); @@ -627,7 +626,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); @@ -647,7 +645,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 |
