| To: | linux-mips@linux-mips.org |
|---|---|
| Subject: | [PATCH] pci: convert to devm_ioremap_resource() |
| From: | Silviu-Mihai Popescu <silviupopescu1990@gmail.com> |
| Date: | Mon, 11 Mar 2013 09:42:33 +0200 |
| Cc: | ralf@linux-mips.org, juhosg@openwrt.org, blogic@openwrt.org, xsecute@googlemail.com, linux-kernel@vger.kernel.org, Silviu-Mihai Popescu <silviupopescu1990@gmail.com> |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=SEPmgOT2Iq4mDz8GWKIHHMaoUpn6QPT/p5wmF8+1UOM=; b=084tD4rk5e/5/+NU6X+yjukj7xUH0TV2AaRMQtynOLevpaTzZymHjw0CNBf1ElKR20 bFlQKVNfKG6VTTrNCZSdwUq04I1CXBP1J1BzZsOeZICsaH06TZRrKrambVE8pIS6a0GC Aau6VqbezXP12HN5+ry1NWhTwpsM2BOu1Z4VDXSUqP0uZg5zMI3WHKiH7szHqjDVMFQb 2OQBzU1OifVUvElokAPJEqSRXsiskEX5tqOrjikaJDNZLcTW9zOFjijD5ZcxdOQyeMX+ oQVQ19e7DvziEk+KE1FT1CHjn2mNYNABF6gLuvJLHF0bmAywQKhbdtPsg1B2hRyD+qsW FKXg== |
| List-archive: | <http://www.linux-mips.org/archives/linux-mips/> |
| List-help: | <mailto:ecartis@linux-mips.org?Subject=help> |
| List-id: | linux-mips <linux-mips.eddie.linux-mips.org> |
| List-owner: | <mailto:ralf@linux-mips.org> |
| List-post: | <mailto:linux-mips@linux-mips.org> |
| List-software: | Ecartis version 1.0.0 |
| List-subscribe: | <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips> |
| List-unsubscribe: | <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips> |
| Sender: | linux-mips-bounce@linux-mips.org |
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: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
---
arch/mips/pci/pci-ar724x.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/mips/pci/pci-ar724x.c b/arch/mips/pci/pci-ar724x.c
index 8a0700d..65ec032 100644
--- a/arch/mips/pci/pci-ar724x.c
+++ b/arch/mips/pci/pci-ar724x.c
@@ -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)
--
1.7.9.5
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH v2, part2 06/10] mm/MIPS: use free_highmem_page() to free highmem pages into buddy system, Jiang Liu |
|---|---|
| Next by Date: | Re: [PATCH] pci: convert to devm_ioremap_resource(), Gabor Juhos |
| Previous by Thread: | [PATCH v2, part2 06/10] mm/MIPS: use free_highmem_page() to free highmem pages into buddy system, Jiang Liu |
| Next by Thread: | Re: [PATCH] pci: convert to devm_ioremap_resource(), Gabor Juhos |
| Indexes: | [Date] [Thread] [Top] [All Lists] |