Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae29223e authored by Himangi Saraogi's avatar Himangi Saraogi Committed by David S. Miller
Browse files

net: dnet: Use managed interfaces 



This patch introduces the use of managed interfaces like
devm_ioremap_resource and does away with the calls to free the
allocated memory in the probe and remove functions. Also, some
labels and variable are done away with. This fixes a bug as there
was a missing release_mem_region in the remove function.

Signed-off-by: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54789983

drivers/net/ethernet/dnet.c

+12 −34
Original line number Original line Diff line number Diff line
@@ -323,7 +323,8 @@ static int dnet_mii_init(struct dnet *bp) 




	bp->mii_bus->priv = bp;

	bp->mii_bus->priv = bp;





	bp->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);

	bp->mii_bus->irq = devm_kmalloc(&bp->pdev->dev,

					sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);

	if (!bp->mii_bus->irq) {

	if (!bp->mii_bus->irq) {

		err = -ENOMEM;

		err = -ENOMEM;

		goto err_out;

		goto err_out;
@@ -334,7 +335,7 @@ static int dnet_mii_init(struct dnet *bp) 




	if (mdiobus_register(bp->mii_bus)) {

	if (mdiobus_register(bp->mii_bus)) {

		err = -ENXIO;

		err = -ENXIO;

		goto err_out_free_mdio_irq;

		goto err_out;

	}

	}





	if (dnet_mii_probe(bp->dev) != 0) {

	if (dnet_mii_probe(bp->dev) != 0) {
@@ -346,8 +347,6 @@ static int dnet_mii_init(struct dnet *bp) 




err_out_unregister_bus:

err_out_unregister_bus:

	mdiobus_unregister(bp->mii_bus);

	mdiobus_unregister(bp->mii_bus);

err_out_free_mdio_irq:

	kfree(bp->mii_bus->irq);

err_out:

err_out:

	mdiobus_free(bp->mii_bus);

	mdiobus_free(bp->mii_bus);

	return err;

	return err;
@@ -825,28 +824,14 @@ static int dnet_probe(struct platform_device *pdev) 
	struct net_device *dev;

	struct net_device *dev;

	struct dnet *bp;

	struct dnet *bp;

	struct phy_device *phydev;

	struct phy_device *phydev;

	int err = -ENXIO;

	int err;

	unsigned int mem_base, mem_size, irq;

	unsigned int irq;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "no mmio resource defined\n");

		goto err_out;

	}

	mem_base = res->start;

	mem_size = resource_size(res);

	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);





	if (!request_mem_region(mem_base, mem_size, DRV_NAME)) {

		dev_err(&pdev->dev, "no memory region available\n");

		err = -EBUSY;

		goto err_out;

	}



	err = -ENOMEM;

	dev = alloc_etherdev(sizeof(*bp));

	dev = alloc_etherdev(sizeof(*bp));

	if (!dev)

	if (!dev)

		goto err_out_release_mem;

		return -ENOMEM;





	/* TODO: Actually, we have some interesting features... */

	/* TODO: Actually, we have some interesting features... */

	dev->features |= 0;

	dev->features |= 0;
@@ -859,10 +844,10 @@ static int dnet_probe(struct platform_device *pdev) 




	spin_lock_init(&bp->lock);

	spin_lock_init(&bp->lock);





	bp->regs = ioremap(mem_base, mem_size);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!bp->regs) {

	bp->regs = devm_ioremap_resource(&pdev->dev, res);

		dev_err(&pdev->dev, "failed to map registers, aborting.\n");

	if (IS_ERR(bp->regs)) {

		err = -ENOMEM;

		err = PTR_ERR(bp->regs);

		goto err_out_free_dev;

		goto err_out_free_dev;

	}

	}
@@ -871,7 +856,7 @@ static int dnet_probe(struct platform_device *pdev) 
	if (err) {

	if (err) {

		dev_err(&pdev->dev, "Unable to request IRQ %d (error %d)\n",

		dev_err(&pdev->dev, "Unable to request IRQ %d (error %d)\n",

		       irq, err);

		       irq, err);

		goto err_out_iounmap;

		goto err_out_free_dev;

	}

	}





	dev->netdev_ops = &dnet_netdev_ops;

	dev->netdev_ops = &dnet_netdev_ops;
@@ -908,7 +893,7 @@ static int dnet_probe(struct platform_device *pdev) 
		goto err_out_unregister_netdev;

		goto err_out_unregister_netdev;





	dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n",

	dev_info(&pdev->dev, "Dave DNET at 0x%p (0x%08x) irq %d %pM\n",

	       bp->regs, mem_base, dev->irq, dev->dev_addr);

	       bp->regs, (unsigned int)res->start, dev->irq, dev->dev_addr);

	dev_info(&pdev->dev, "has %smdio, %sirq, %sgigabit, %sdma\n",

	dev_info(&pdev->dev, "has %smdio, %sirq, %sgigabit, %sdma\n",

	       (bp->capabilities & DNET_HAS_MDIO) ? "" : "no ",

	       (bp->capabilities & DNET_HAS_MDIO) ? "" : "no ",

	       (bp->capabilities & DNET_HAS_IRQ) ? "" : "no ",

	       (bp->capabilities & DNET_HAS_IRQ) ? "" : "no ",
@@ -925,13 +910,8 @@ static int dnet_probe(struct platform_device *pdev) 
	unregister_netdev(dev);

	unregister_netdev(dev);

err_out_free_irq:

err_out_free_irq:

	free_irq(dev->irq, dev);

	free_irq(dev->irq, dev);

err_out_iounmap:

	iounmap(bp->regs);

err_out_free_dev:

err_out_free_dev:

	free_netdev(dev);

	free_netdev(dev);

err_out_release_mem:

	release_mem_region(mem_base, mem_size);

err_out:

	return err;

	return err;

}

}
@@ -948,11 +928,9 @@ static int dnet_remove(struct platform_device *pdev) 
		if (bp->phy_dev)

		if (bp->phy_dev)

			phy_disconnect(bp->phy_dev);

			phy_disconnect(bp->phy_dev);

		mdiobus_unregister(bp->mii_bus);

		mdiobus_unregister(bp->mii_bus);

		kfree(bp->mii_bus->irq);

		mdiobus_free(bp->mii_bus);

		mdiobus_free(bp->mii_bus);

		unregister_netdev(dev);

		unregister_netdev(dev);

		free_irq(dev->irq, dev);

		free_irq(dev->irq, dev);

		iounmap(bp->regs);

		free_netdev(dev);

		free_netdev(dev);

	}

	}