Messages in this thread Patch in this message | | | Date | Mon, 19 Aug 2013 13:47:23 +0200 (CEST) | From | Julia Lawall <> | Subject | [PATCH 4/6 v2] usb: musb: dsps: simplify platform_get_resource_byname/devm_ioremap_resource |
| |
From: Julia Lawall <Julia.Lawall@lip6.fr>
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>
This patch also adjusts the error-handling code on the call to devm_ioremap_resource to check the right value, noticed by Svenning Sørensen.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
--- v2: Fixed the bug on the test of the result of devm_ioremap_resource
drivers/usb/musb/musb_dsps.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index 4ffbaac..e60be6f 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -357,12 +357,9 @@ static int dsps_musb_init(struct musb *musb) u32 rev, val;
r = platform_get_resource_byname(parent, IORESOURCE_MEM, "control"); - if (!r) - return -EINVAL; - reg_base = devm_ioremap_resource(dev, r); - if (!musb->ctrl_base) - return -EINVAL; + if (IS_ERR(reg_base)) + return PTR_ERR(reg_base); musb->ctrl_base = reg_base;
/* NOP driver needs change if supporting dual instance */ | |