Commit f560fabd authored by Silviu-Mihai Popescu's avatar Silviu-Mihai Popescu Committed by Ralf Baechle

MIPS: pci: convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.
Signed-off-by: default avatarSilviu-Mihai Popescu <silviupopescu1990@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/4986/Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 30189651
...@@ -366,9 +366,9 @@ static int ar71xx_pci_probe(struct platform_device *pdev) ...@@ -366,9 +366,9 @@ static int ar71xx_pci_probe(struct platform_device *pdev)
if (!res) if (!res)
return -EINVAL; return -EINVAL;
apc->cfg_base = devm_request_and_ioremap(&pdev->dev, res); apc->cfg_base = devm_ioremap_resource(&pdev->dev, res);
if (!apc->cfg_base) if (IS_ERR(apc->cfg_base))
return -ENOMEM; return PTR_ERR(apc->cfg_base);
apc->irq = platform_get_irq(pdev, 0); apc->irq = platform_get_irq(pdev, 0);
if (apc->irq < 0) if (apc->irq < 0)
......
...@@ -365,25 +365,25 @@ static int ar724x_pci_probe(struct platform_device *pdev) ...@@ -365,25 +365,25 @@ static int ar724x_pci_probe(struct platform_device *pdev)
if (!res) if (!res)
return -EINVAL; return -EINVAL;
apc->ctrl_base = devm_request_and_ioremap(&pdev->dev, res); apc->ctrl_base = devm_ioremap_resource(&pdev->dev, res);
if (apc->ctrl_base == NULL) if (IS_ERR(apc->ctrl_base))
return -EBUSY; return PTR_ERR(apc->ctrl_base);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
if (!res) if (!res)
return -EINVAL; return -EINVAL;
apc->devcfg_base = devm_request_and_ioremap(&pdev->dev, res); apc->devcfg_base = devm_ioremap_resource(&pdev->dev, res);
if (!apc->devcfg_base) if (IS_ERR(apc->devcfg_base))
return -EBUSY; return PTR_ERR(apc->devcfg_base);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crp_base"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crp_base");
if (!res) if (!res)
return -EINVAL; return -EINVAL;
apc->crp_base = devm_request_and_ioremap(&pdev->dev, res); apc->crp_base = devm_ioremap_resource(&pdev->dev, res);
if (apc->crp_base == NULL) if (IS_ERR(apc->crp_base))
return -EBUSY; return PTR_ERR(apc->crp_base);
apc->irq = platform_get_irq(pdev, 0); apc->irq = platform_get_irq(pdev, 0);
if (apc->irq < 0) if (apc->irq < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment