mirror of https://github.com/hak5/openwrt-owl.git
71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
|
From 59a93f8909b8ab5d61e024e8b3771fdf94a774f0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Julia Lawall <Julia.Lawall@lip6.fr>
|
||
|
|
Date: Mon, 19 Aug 2013 10:51:56 +0200
|
||
|
|
Subject: [PATCH] MIPS: ath79: simplify platform_get_resource_byname/devm_ioremap_resource
|
||
|
|
|
||
|
|
Remove unneeded error handling on the result of a call to
|
||
|
|
platform_get_resource_byname when the value is passed to devm_ioremap_resource.
|
||
|
|
|
||
|
|
A simplified version of the semantic patch that makes this change is as
|
||
|
|
follows: (http://coccinelle.lip6.fr/)
|
||
|
|
|
||
|
|
// <smpl>
|
||
|
|
@@
|
||
|
|
expression pdev,res,e,e1;
|
||
|
|
expression ret != 0;
|
||
|
|
identifier l;
|
||
|
|
@@
|
||
|
|
|
||
|
|
res = platform_get_resource_byname(...);
|
||
|
|
- if (res == NULL) { ... \(goto l;\|return ret;\) }
|
||
|
|
e = devm_ioremap_resource(e1, res);
|
||
|
|
// </smpl>
|
||
|
|
|
||
|
|
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
|
||
|
|
Acked-by: Gabor Juhos <juhosg@openwrt.org>
|
||
|
|
---
|
||
|
|
arch/mips/pci/pci-ar71xx.c | 3 ---
|
||
|
|
arch/mips/pci/pci-ar724x.c | 9 ---------
|
||
|
|
2 files changed, 12 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/mips/pci/pci-ar71xx.c
|
||
|
|
+++ b/arch/mips/pci/pci-ar71xx.c
|
||
|
|
@@ -363,9 +363,6 @@ static int ar71xx_pci_probe(struct platf
|
||
|
|
spin_lock_init(&apc->lock);
|
||
|
|
|
||
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
|
||
|
|
- if (!res)
|
||
|
|
- return -EINVAL;
|
||
|
|
-
|
||
|
|
apc->cfg_base = devm_ioremap_resource(&pdev->dev, res);
|
||
|
|
if (IS_ERR(apc->cfg_base))
|
||
|
|
return PTR_ERR(apc->cfg_base);
|
||
|
|
--- a/arch/mips/pci/pci-ar724x.c
|
||
|
|
+++ b/arch/mips/pci/pci-ar724x.c
|
||
|
|
@@ -362,25 +362,16 @@ static int ar724x_pci_probe(struct platf
|
||
|
|
return -ENOMEM;
|
||
|
|
|
||
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl_base");
|
||
|
|
- if (!res)
|
||
|
|
- return -EINVAL;
|
||
|
|
-
|
||
|
|
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_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_ioremap_resource(&pdev->dev, res);
|
||
|
|
if (IS_ERR(apc->crp_base))
|
||
|
|
return PTR_ERR(apc->crp_base);
|