drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent

[deliverable/linux.git] / drivers / net / ethernet / tundra / tsi108_eth.c

diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 3c69a04608324c8c16bc33cee78f03f524329018..f2e76c9d736cfe32e3b365bbb405f1d284aae6e8 100644 (file)
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1308,13 +1308,13 @@ static int tsi108_open(struct net_device *dev)
                       data->id, dev->irq, dev->name);
        }
 
-       data->rxring = dma_alloc_coherent(NULL, rxring_size, &data->rxdma,
-                                         GFP_KERNEL | __GFP_ZERO);
+       data->rxring = dma_zalloc_coherent(NULL, rxring_size, &data->rxdma,
+                                          GFP_KERNEL);
        if (!data->rxring)
                return -ENOMEM;
 
-       data->txring = dma_alloc_coherent(NULL, txring_size, &data->txdma,
-                                         GFP_KERNEL | __GFP_ZERO);
+       data->txring = dma_zalloc_coherent(NULL, txring_size, &data->txdma,
+                                          GFP_KERNEL);
        if (!data->txring) {
                pci_free_consistent(0, rxring_size, data->rxring, data->rxdma);
                return -ENOMEM;
@@ -1682,7 +1682,6 @@ static int tsi108_ether_remove(struct platform_device *pdev)
 
        unregister_netdev(dev);
        tsi108_stop_ethernet(dev);
-       platform_set_drvdata(pdev, NULL);
        iounmap(priv->regs);
        iounmap(priv->phyregs);
        free_netdev(dev);