Merge remote-tracking branch 'agust/next' into next

[~andy/linux] / drivers / net / hippi / rrunner.c

diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 00ed75155ce8d4b7faff9ca9f3a98c28d355ff4c..e580583f196d91dd9b5c5e9d8d798f0b5cf01752 100644 (file)
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -37,7 +37,6 @@
 #include <linux/netdevice.h>
 #include <linux/hippidevice.h>
 #include <linux/skbuff.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
@@ -213,10 +212,8 @@ static int rr_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                                    rrpriv->tx_ring_dma);
        if (rrpriv->regs)
                pci_iounmap(pdev, rrpriv->regs);
-       if (pdev) {
+       if (pdev)
                pci_release_regions(pdev);
-               pci_set_drvdata(pdev, NULL);
-       }
  out2:
        free_netdev(dev);
  out3:
@@ -244,7 +241,6 @@ static void rr_remove_one(struct pci_dev *pdev)
        pci_iounmap(pdev, rr->regs);
        pci_release_regions(pdev);
        pci_disable_device(pdev);
-       pci_set_drvdata(pdev, NULL);
        free_netdev(dev);
 }