ethernet: amd: move amd111e_remove_one after probe
authorVarka Bhadram <varkab@cdac.in>
Mon, 14 Jul 2014 08:39:04 +0000 (14:09 +0530)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jul 2014 02:14:15 +0000 (19:14 -0700)
This patch moves the remove functionalities after the probe
so that we can see the registered and released resources properly.
Every driver follows the same concept.

Signed-off-by: Varka Bhadram <varkab@cdac.in>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/amd/amd8111e.c

index 068dc7c..ddd09e8 100644 (file)
@@ -1701,18 +1701,6 @@ static int amd8111e_resume(struct pci_dev *pci_dev)
        return 0;
 }
 
-
-static void amd8111e_remove_one(struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-       if (dev) {
-               unregister_netdev(dev);
-               iounmap(((struct amd8111e_priv *)netdev_priv(dev))->mmio);
-               free_netdev(dev);
-               pci_release_regions(pdev);
-               pci_disable_device(pdev);
-       }
-}
 static void amd8111e_config_ipg(struct net_device* dev)
 {
        struct amd8111e_priv *lp = netdev_priv(dev);
@@ -1970,6 +1958,19 @@ err_disable_pdev:
 
 }
 
+static void amd8111e_remove_one(struct pci_dev *pdev)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+
+       if (dev) {
+               unregister_netdev(dev);
+               iounmap(((struct amd8111e_priv *)netdev_priv(dev))->mmio);
+               free_netdev(dev);
+               pci_release_regions(pdev);
+               pci_disable_device(pdev);
+       }
+}
+
 static struct pci_driver amd8111e_driver = {
        .name           = MODULE_NAME,
        .id_table       = amd8111e_pci_tbl,