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

ethernet: amd: use devm_ioremap()

Browse Source 
This patch replace ioremap() with the devm_ioremap() so that
the resource will be freed automatically with the probe failed.

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:05 +05:30
committed by David S. Miller
parent 43519e60ef
commit 711fec5d22
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1866,7 +1866,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
lp->mmio = ioremap(reg_addr, reg_len); lp->mmio = devm_ioremap(&pdev->dev, reg_addr, reg_len);
if (!lp->mmio) { if (!lp->mmio) {
printk(KERN_ERR "amd8111e: Cannot map device registers, " printk(KERN_ERR "amd8111e: Cannot map device registers, "
"exiting\n"); "exiting\n");
@@ -1913,7 +1913,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
if (err) { if (err) {
printk(KERN_ERR "amd8111e: Cannot register net device, " printk(KERN_ERR "amd8111e: Cannot register net device, "
"exiting.\n"); "exiting.\n");
goto err_iounmap; goto err_free_dev;
} }
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
@@ -1943,8 +1943,6 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
printk(KERN_INFO "%s: Couldn't detect MII PHY, assuming address 0x01\n", printk(KERN_INFO "%s: Couldn't detect MII PHY, assuming address 0x01\n",
dev->name); dev->name);
return 0; return 0;
err_iounmap:
iounmap(lp->mmio);
err_free_dev: err_free_dev:
free_netdev(dev); free_netdev(dev);
@@ -1964,7 +1962,6 @@ static void amd8111e_remove_one(struct pci_dev *pdev)
if (dev) { if (dev) {
unregister_netdev(dev); unregister_netdev(dev);
iounmap(((struct amd8111e_priv *)netdev_priv(dev))->mmio);
free_netdev(dev); free_netdev(dev);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);