* [PATCH 1/2] arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
@ 2011-01-27 15:49 Julia Lawall
2011-01-27 19:02 ` Jarkko Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Julia Lawall @ 2011-01-27 15:49 UTC (permalink / raw)
To: linux-arm-kernel
This code elsewhere returns a negative constant to an indicate an error,
while IS_ERR returns the result of a >= operation.
The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x;
@@
if (...) { ...
- return IS_ERR(x);
+ return PTR_ERR(x);
}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
arch/arm/mach-omap2/dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -u -p a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_
if (IS_ERR(od)) {
pr_err("%s: Cant build omap_device for %s:%s.\n",
__func__, name, oh->name);
- return IS_ERR(od);
+ return PTR_ERR(od);
}
mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0);
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/2] arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
2011-01-27 15:49 [PATCH 1/2] arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR Julia Lawall
@ 2011-01-27 19:02 ` Jarkko Nikula
2011-01-28 0:26 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Nikula @ 2011-01-27 19:02 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 27 Jan 2011 16:49:06 +0100
Julia Lawall <julia@diku.dk> wrote:
> diff -u -p a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
> --- a/arch/arm/mach-omap2/dma.c
> +++ b/arch/arm/mach-omap2/dma.c
> @@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_
> if (IS_ERR(od)) {
> pr_err("%s: Cant build omap_device for %s:%s.\n",
> __func__, name, oh->name);
> - return IS_ERR(od);
> + return PTR_ERR(od);
> }
>
FWIW,
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/2] arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
2011-01-27 19:02 ` Jarkko Nikula
@ 2011-01-28 0:26 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2011-01-28 0:26 UTC (permalink / raw)
To: linux-arm-kernel
* Jarkko Nikula <jhnikula@gmail.com> [110127 11:03]:
> On Thu, 27 Jan 2011 16:49:06 +0100
> Julia Lawall <julia@diku.dk> wrote:
>
> > diff -u -p a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
> > --- a/arch/arm/mach-omap2/dma.c
> > +++ b/arch/arm/mach-omap2/dma.c
> > @@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_
> > if (IS_ERR(od)) {
> > pr_err("%s: Cant build omap_device for %s:%s.\n",
> > __func__, name, oh->name);
> > - return IS_ERR(od);
> > + return PTR_ERR(od);
> > }
> >
> FWIW,
>
> Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Thanks, will queue as a fix during the -rc cycle.
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-28 0:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-27 15:49 [PATCH 1/2] arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR Julia Lawall
2011-01-27 19:02 ` Jarkko Nikula
2011-01-28 0:26 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).