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

Commit f607e059 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

bcm63xx_enet: replace devm_request_and_ioremap by devm_ioremap_resource 



Use devm_ioremap_resource instead of devm_request_and_ioremap.

This was done using the semantic patch
scripts/coccinelle/api/devm_ioremap_resource.cocci

The relevant call to platform_get_resource was manually moved down to the
call to devm_ioremap_resource.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84ce22df

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+5 −5
Original line number Diff line number Diff line
@@ -1747,11 +1747,10 @@ static int bcm_enet_probe(struct platform_device *pdev) 
	if (!bcm_enet_shared_base[0])

		return -ENODEV;



	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);

	res_irq_tx = platform_get_resource(pdev, IORESOURCE_IRQ, 2);

	if (!res_mem || !res_irq || !res_irq_rx || !res_irq_tx)

	if (!res_irq || !res_irq_rx || !res_irq_tx)

		return -ENODEV;



	ret = 0;
@@ -1767,9 +1766,10 @@ static int bcm_enet_probe(struct platform_device *pdev) 
	if (ret)

		goto out;



	priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);

	if (priv->base == NULL) {

		ret = -ENOMEM;

	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(&pdev->dev, res_mem);

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto out;

	}