Re: [PATCH 4/6 v2] usb: musb: dsps: simplify platform_get_resource_byname/devm_ioremap_resource

Sergei Shtylyov
2013-08-19T14:29:37Z

Hello.

On 08/19/2013 03:47 PM, Julia Lawall wrote:

> 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.

Saying "also" in the changelog is usuallly a good sign the patch should be
split.

> 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);

This is indented with space, not tabs. And of course, this was a matter of
a separate *fix* patch, while the original patch was a *cleanup*.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html