Commit c2be6262 authored by Petri T. Koistinen's avatar Petri T. Koistinen Committed by Linus Torvalds

[PATCH] Fix 3c59x.c uses of plain integer as NULL pointer

This patch will fix 3Com "Vortex" and "Boomerang" ethernet driver sparse
warnings about using plain integer as NULL pointer.
Signed-off-by: default avatarPetri T. Koistinen <petri.koistinen@iki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent af512108
...@@ -568,7 +568,7 @@ static struct vortex_chip_info { ...@@ -568,7 +568,7 @@ static struct vortex_chip_info {
{"3c920B-EMB-WNM Tornado", {"3c920B-EMB-WNM Tornado",
PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, }, PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
{0,}, /* 0 terminated list. */ {NULL,}, /* NULL terminated list. */
}; };
...@@ -1695,7 +1695,7 @@ vortex_up(struct net_device *dev) ...@@ -1695,7 +1695,7 @@ vortex_up(struct net_device *dev)
for (i = 0; i < RX_RING_SIZE; i++) /* AKPM: this is done in vortex_open, too */ for (i = 0; i < RX_RING_SIZE; i++) /* AKPM: this is done in vortex_open, too */
vp->rx_ring[i].status = 0; vp->rx_ring[i].status = 0;
for (i = 0; i < TX_RING_SIZE; i++) for (i = 0; i < TX_RING_SIZE; i++)
vp->tx_skbuff[i] = 0; vp->tx_skbuff[i] = NULL;
outl(0, ioaddr + DownListPtr); outl(0, ioaddr + DownListPtr);
} }
/* Set receiver mode: presumably accept b-case and phys addr only. */ /* Set receiver mode: presumably accept b-case and phys addr only. */
...@@ -1760,7 +1760,7 @@ vortex_open(struct net_device *dev) ...@@ -1760,7 +1760,7 @@ vortex_open(struct net_device *dev)
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
if (vp->rx_skbuff[j]) { if (vp->rx_skbuff[j]) {
dev_kfree_skb(vp->rx_skbuff[j]); dev_kfree_skb(vp->rx_skbuff[j]);
vp->rx_skbuff[j] = 0; vp->rx_skbuff[j] = NULL;
} }
} }
retval = -ENOMEM; retval = -ENOMEM;
...@@ -1938,9 +1938,9 @@ static void vortex_tx_timeout(struct net_device *dev) ...@@ -1938,9 +1938,9 @@ static void vortex_tx_timeout(struct net_device *dev)
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
if (vp->full_bus_master_tx) if (vp->full_bus_master_tx)
boomerang_interrupt(dev->irq, dev, 0); boomerang_interrupt(dev->irq, dev, NULL);
else else
vortex_interrupt(dev->irq, dev, 0); vortex_interrupt(dev->irq, dev, NULL);
local_irq_restore(flags); local_irq_restore(flags);
} }
} }
...@@ -2419,7 +2419,7 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2419,7 +2419,7 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
le32_to_cpu(vp->tx_ring[entry].addr), skb->len, PCI_DMA_TODEVICE); le32_to_cpu(vp->tx_ring[entry].addr), skb->len, PCI_DMA_TODEVICE);
#endif #endif
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
vp->tx_skbuff[entry] = 0; vp->tx_skbuff[entry] = NULL;
} else { } else {
printk(KERN_DEBUG "boomerang_interrupt: no skb!\n"); printk(KERN_DEBUG "boomerang_interrupt: no skb!\n");
} }
...@@ -2724,7 +2724,7 @@ vortex_close(struct net_device *dev) ...@@ -2724,7 +2724,7 @@ vortex_close(struct net_device *dev)
pci_unmap_single( VORTEX_PCI(vp), le32_to_cpu(vp->rx_ring[i].addr), pci_unmap_single( VORTEX_PCI(vp), le32_to_cpu(vp->rx_ring[i].addr),
PKT_BUF_SZ, PCI_DMA_FROMDEVICE); PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
dev_kfree_skb(vp->rx_skbuff[i]); dev_kfree_skb(vp->rx_skbuff[i]);
vp->rx_skbuff[i] = 0; vp->rx_skbuff[i] = NULL;
} }
} }
if (vp->full_bus_master_tx) { /* Free Boomerang bus master Tx buffers. */ if (vp->full_bus_master_tx) { /* Free Boomerang bus master Tx buffers. */
...@@ -2743,7 +2743,7 @@ vortex_close(struct net_device *dev) ...@@ -2743,7 +2743,7 @@ vortex_close(struct net_device *dev)
pci_unmap_single(VORTEX_PCI(vp), le32_to_cpu(vp->tx_ring[i].addr), skb->len, PCI_DMA_TODEVICE); pci_unmap_single(VORTEX_PCI(vp), le32_to_cpu(vp->tx_ring[i].addr), skb->len, PCI_DMA_TODEVICE);
#endif #endif
dev_kfree_skb(skb); dev_kfree_skb(skb);
vp->tx_skbuff[i] = 0; vp->tx_skbuff[i] = NULL;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment