Skip to content

Commit

Permalink
ethernet: amd: use devm_ioremap()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Varka Bhadram authored and David S. Miller committed Jul 15, 2014
1 parent 43519e6 commit 711fec5
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/net/ethernet/amd/amd8111e.c
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,

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) {
printk(KERN_ERR "amd8111e: Cannot map device registers, "
"exiting\n");
Expand Down Expand Up @@ -1913,7 +1913,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
if (err) {
printk(KERN_ERR "amd8111e: Cannot register net device, "
"exiting.\n");
goto err_iounmap;
goto err_free_dev;
}

pci_set_drvdata(pdev, dev);
Expand Down Expand Up @@ -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",
dev->name);
return 0;
err_iounmap:
iounmap(lp->mmio);

err_free_dev:
free_netdev(dev);
Expand All @@ -1964,7 +1962,6 @@ static void amd8111e_remove_one(struct pci_dev *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);
Expand Down

0 comments on commit 711fec5

Please sign in to comment.