lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ethernet: amd: move amd111e_remove_one after probe

Browse Source 
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>
This commit is contained in:
Varka Bhadram
2014-07-14 14:09:04 +05:30
committed by David S. Miller
parent 30c9e022c5
commit 43519e60ef
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ethernet/amd/amd8111e.c
View File

@@ -1701,18 +1701,6 @@ static int amd8111e_resume(struct pci_dev *pci_dev)
return 0; 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) static void amd8111e_config_ipg(struct net_device* dev)
{ {
struct amd8111e_priv *lp = netdev_priv(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 = { static struct pci_driver amd8111e_driver = {
.name = MODULE_NAME, .name = MODULE_NAME,
.id_table = amd8111e_pci_tbl, .id_table = amd8111e_pci_tbl,