drivers/net: Remove pointless checks for NULL prior to calling kfree() (b4558ea9) · Commits · 戴 / test

drivers/net/acenic.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -871,9 +871,7 @@ static void ace_init_cleanup(struct net_device *dev)
		if (ap->info)
		pci_free_consistent(ap->pdev, sizeof(struct ace_info),
		ap->info, ap->info_dma);
		if (ap->skb)
		kfree(ap->skb);
		if (ap->trace_buf)
		kfree(ap->trace_buf);

		if (dev->irq)

+2 −4

Original line number	Diff line number	Diff line
		@@ -1606,7 +1606,6 @@ err_out:
		/* here we should have a valid dev plus aup-> register addresses
		* so we can reset the mac properly.*/
		reset_mac(dev);
		if (aup->mii)
		kfree(aup->mii);
		for (i = 0; i < NUM_RX_DMA; i++) {
		if (aup->rx_db_inuse[i])
		@@ -1806,7 +1805,6 @@ static void __exit au1000_cleanup_module(void)
		if (dev) {
		aup = (struct au1000_private *) dev->priv;
		unregister_netdev(dev);
		if (aup->mii)
		kfree(aup->mii);
		for (j = 0; j < NUM_RX_DMA; j++) {
		if (aup->rx_db_inuse[j])

+4 −8

Original line number	Diff line number	Diff line
		@@ -1131,14 +1131,10 @@ static void b44_init_rings(struct b44 *bp)
		*/
		static void b44_free_consistent(struct b44 *bp)
		{
		if (bp->rx_buffers) {
		kfree(bp->rx_buffers);
		bp->rx_buffers = NULL;
		}
		if (bp->tx_buffers) {
		kfree(bp->tx_buffers);
		bp->tx_buffers = NULL;
		}
		if (bp->rx_ring) {
		if (bp->flags & B44_FLAG_RX_RING_HACK) {
		dma_unmap_single(&bp->pdev->dev, bp->rx_ring_dma,

+2 −4

Original line number	Diff line number	Diff line
		@@ -1689,11 +1689,9 @@ static void __exit bmac_exit(void)
		{
		macio_unregister_driver(&bmac_driver);

		if (bmac_emergency_rxbuf != NULL) {
		kfree(bmac_emergency_rxbuf);
		bmac_emergency_rxbuf = NULL;
		}
		}

		MODULE_AUTHOR("Randy Gobbel/Paul Mackerras");
		MODULE_DESCRIPTION("PowerMac BMAC ethernet driver.");

+4 −8

Original line number	Diff line number	Diff line
		@@ -314,21 +314,17 @@ bnx2_free_mem(struct bnx2 *bp)
		bp->tx_desc_ring, bp->tx_desc_mapping);
		bp->tx_desc_ring = NULL;
		}
		if (bp->tx_buf_ring) {
		kfree(bp->tx_buf_ring);
		bp->tx_buf_ring = NULL;
		}
		if (bp->rx_desc_ring) {
		pci_free_consistent(bp->pdev,
		sizeof(struct rx_bd) * RX_DESC_CNT,
		bp->rx_desc_ring, bp->rx_desc_mapping);
		bp->rx_desc_ring = NULL;
		}
		if (bp->rx_buf_ring) {
		kfree(bp->rx_buf_ring);
		bp->rx_buf_ring = NULL;
		}
		}

		static int
		bnx2_alloc_mem(struct bnx2 *bp)