leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bcm63xx_enet: replace devm_request_and_ioremap by devm_ioremap_resource

Browse Source 
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: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julia Lawall 2013-08-19 13:20:39 +02:00 committed by David S. Miller
parent 84ce22df92
commit f607e05950
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/broadcom/bcm63xx_enet.c
View File

@ -1747,11 +1747,10 @@ static int bcm_enet_probe(struct platform_device *pdev)
if (!bcm_enet_shared_base[0]) if (!bcm_enet_shared_base[0])
return -ENODEV; return -ENODEV;
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1); res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
res_irq_tx = platform_get_resource(pdev, IORESOURCE_IRQ, 2); 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; return -ENODEV;
ret = 0; ret = 0;
@ -1767,9 +1766,10 @@ static int bcm_enet_probe(struct platform_device *pdev)
if (ret) if (ret)
goto out; goto out;
priv->base = devm_request_and_ioremap(&pdev->dev, res_mem); res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (priv->base == NULL) { priv->base = devm_ioremap_resource(&pdev->dev, res_mem);
ret = -ENOMEM; if (IS_ERR(priv->base)) {
ret = PTR_ERR(priv->base);
goto out; goto out;
} }