MIPS: 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. devm_ioremap_resource() provides its own error messages so all explicit error messages can be removed from the failure code paths. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
5857bd98db
commit
7c390a7e95
@@ -214,13 +214,13 @@ static int ltq_pci_probe(struct platform_device *pdev)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ltq_pci_membase = devm_request_and_ioremap(&pdev->dev, res_bridge);
|
||||
ltq_pci_mapped_cfg = devm_request_and_ioremap(&pdev->dev, res_cfg);
|
||||
ltq_pci_membase = devm_ioremap_resource(&pdev->dev, res_bridge);
|
||||
if (IS_ERR(ltq_pci_membase))
|
||||
return PTR_ERR(ltq_pci_membase);
|
||||
|
||||
if (!ltq_pci_membase || !ltq_pci_mapped_cfg) {
|
||||
dev_err(&pdev->dev, "failed to remap resources\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg);
|
||||
if (IS_ERR(ltq_pci_mapped_cfg))
|
||||
return PTR_ERR(ltq_pci_mapped_cfg);
|
||||
|
||||
ltq_pci_startup(pdev);
|
||||
|
||||
|
Reference in New Issue
Block a user