Commit 3c5b9caf authored by Jingoo Han's avatar Jingoo Han Committed by David S. Miller

net: tulip: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eccdfaa
...@@ -2110,7 +2110,6 @@ static void de_remove_one(struct pci_dev *pdev) ...@@ -2110,7 +2110,6 @@ static void de_remove_one(struct pci_dev *pdev)
iounmap(de->regs); iounmap(de->regs);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
free_netdev(dev); free_netdev(dev);
} }
......
...@@ -523,7 +523,6 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -523,7 +523,6 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
err_out_disable: err_out_disable:
pci_disable_device(pdev); pci_disable_device(pdev);
err_out_free: err_out_free:
pci_set_drvdata(pdev, NULL);
free_netdev(dev); free_netdev(dev);
return err; return err;
...@@ -548,8 +547,6 @@ static void dmfe_remove_one(struct pci_dev *pdev) ...@@ -548,8 +547,6 @@ static void dmfe_remove_one(struct pci_dev *pdev)
db->buf_pool_ptr, db->buf_pool_dma_ptr); db->buf_pool_ptr, db->buf_pool_dma_ptr);
pci_release_regions(pdev); pci_release_regions(pdev);
free_netdev(dev); /* free board information */ free_netdev(dev); /* free board information */
pci_set_drvdata(pdev, NULL);
} }
DMFE_DBUG(0, "dmfe_remove_one() exit", 0); DMFE_DBUG(0, "dmfe_remove_one() exit", 0);
......
...@@ -1939,7 +1939,6 @@ static void tulip_remove_one(struct pci_dev *pdev) ...@@ -1939,7 +1939,6 @@ static void tulip_remove_one(struct pci_dev *pdev)
pci_iounmap(pdev, tp->base_addr); pci_iounmap(pdev, tp->base_addr);
free_netdev (dev); free_netdev (dev);
pci_release_regions (pdev); pci_release_regions (pdev);
pci_set_drvdata (pdev, NULL);
/* pci_power_off (pdev, -1); */ /* pci_power_off (pdev, -1); */
} }
......
...@@ -429,7 +429,6 @@ static int uli526x_init_one(struct pci_dev *pdev, ...@@ -429,7 +429,6 @@ static int uli526x_init_one(struct pci_dev *pdev,
err_out_disable: err_out_disable:
pci_disable_device(pdev); pci_disable_device(pdev);
err_out_free: err_out_free:
pci_set_drvdata(pdev, NULL);
free_netdev(dev); free_netdev(dev);
return err; return err;
...@@ -450,7 +449,6 @@ static void uli526x_remove_one(struct pci_dev *pdev) ...@@ -450,7 +449,6 @@ static void uli526x_remove_one(struct pci_dev *pdev)
db->buf_pool_ptr, db->buf_pool_dma_ptr); db->buf_pool_ptr, db->buf_pool_dma_ptr);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
free_netdev(dev); free_netdev(dev);
} }
......
...@@ -468,7 +468,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -468,7 +468,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0; return 0;
err_out_cleardev: err_out_cleardev:
pci_set_drvdata(pdev, NULL);
pci_iounmap(pdev, ioaddr); pci_iounmap(pdev, ioaddr);
err_out_free_res: err_out_free_res:
pci_release_regions(pdev); pci_release_regions(pdev);
...@@ -1542,8 +1541,6 @@ static void w840_remove1(struct pci_dev *pdev) ...@@ -1542,8 +1541,6 @@ static void w840_remove1(struct pci_dev *pdev)
pci_iounmap(pdev, np->base_addr); pci_iounmap(pdev, np->base_addr);
free_netdev(dev); free_netdev(dev);
} }
pci_set_drvdata(pdev, NULL);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
...@@ -289,7 +289,6 @@ static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -289,7 +289,6 @@ static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id)
err_unmap: err_unmap:
pci_iounmap(pdev, private->ioaddr); pci_iounmap(pdev, private->ioaddr);
reg_fail: reg_fail:
pci_set_drvdata(pdev, NULL);
dma_free_coherent(d, 8192, private->tx_buffer, private->tx_dma_handle); dma_free_coherent(d, 8192, private->tx_buffer, private->tx_dma_handle);
tx_buf_fail: tx_buf_fail:
dma_free_coherent(d, 8192, private->rx_buffer, private->rx_dma_handle); dma_free_coherent(d, 8192, private->rx_buffer, private->rx_dma_handle);
...@@ -317,7 +316,6 @@ static void xircom_remove(struct pci_dev *pdev) ...@@ -317,7 +316,6 @@ static void xircom_remove(struct pci_dev *pdev)
unregister_netdev(dev); unregister_netdev(dev);
pci_iounmap(pdev, card->ioaddr); pci_iounmap(pdev, card->ioaddr);
pci_set_drvdata(pdev, NULL);
dma_free_coherent(d, 8192, card->tx_buffer, card->tx_dma_handle); dma_free_coherent(d, 8192, card->tx_buffer, card->tx_dma_handle);
dma_free_coherent(d, 8192, card->rx_buffer, card->rx_dma_handle); dma_free_coherent(d, 8192, card->rx_buffer, card->rx_dma_handle);
free_netdev(dev); free_netdev(dev);
......
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