|
@@ -365,25 +365,25 @@ static int ar724x_pci_probe(struct platform_device *pdev)
|
|
|
if (!res)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- apc->ctrl_base = devm_request_and_ioremap(&pdev->dev, res);
|
|
|
- if (apc->ctrl_base == NULL)
|
|
|
- return -EBUSY;
|
|
|
+ apc->ctrl_base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
+ if (IS_ERR(apc->ctrl_base))
|
|
|
+ return PTR_ERR(apc->ctrl_base);
|
|
|
|
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
|
|
|
if (!res)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- apc->devcfg_base = devm_request_and_ioremap(&pdev->dev, res);
|
|
|
- if (!apc->devcfg_base)
|
|
|
- return -EBUSY;
|
|
|
+ apc->devcfg_base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
+ if (IS_ERR(apc->devcfg_base))
|
|
|
+ return PTR_ERR(apc->devcfg_base);
|
|
|
|
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crp_base");
|
|
|
if (!res)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- apc->crp_base = devm_request_and_ioremap(&pdev->dev, res);
|
|
|
- if (apc->crp_base == NULL)
|
|
|
- return -EBUSY;
|
|
|
+ apc->crp_base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
+ if (IS_ERR(apc->crp_base))
|
|
|
+ return PTR_ERR(apc->crp_base);
|
|
|
|
|
|
apc->irq = platform_get_irq(pdev, 0);
|
|
|
if (apc->irq < 0)
|