All of lore.kernel.org
 help / color / mirror / Atom feed
From: Julia Lawall <Julia.Lawall@lip6.fr>
To: Paul Mundt <lethal@linux-sh.org>
Cc: kernel-janitors@vger.kernel.org,
	Simon Horman <horms@verge.net.au>,
	Magnus Damm <magnus.damm@gmail.com>,
	linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/15] drivers/sh/intc/of_intc.c: adjust duplicate test
Date: Mon, 21 Jan 2013 12:16:42 +0000	[thread overview]
Message-ID: <1358773378-4700-2-git-send-email-Julia.Lawall@lip6.fr> (raw)
In-Reply-To: <1358773378-4700-1-git-send-email-Julia.Lawall@lip6.fr>

From: Julia Lawall <Julia.Lawall@lip6.fr>

Delete successive tests to the same location.  In this case intc_node has
already been tested for being NULL, and calling of_find_node_by_name will
not make it NULL.  On the other hand, of_find_node_by_name can return NULL
on failure.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@s exists@
local idexpression y;
expression x,e;
@@

*if ( \(x = NULL\|IS_ERR(x)\|y != 0\) )
 { ... when forall
   return ...; }
... when != \(y = e\|y += e\|y -= e\|y |= e\|y &= e\|y++\|y--\|&y\)
    when != \(XT_GETPAGE(...,y)\|WMI_CMD_BUF(...)\)
*if ( \(x = NULL\|IS_ERR(x)\|y != 0\) )
 { ... when forall
   return ...; }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/sh/intc/of_intc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/sh/intc/of_intc.c b/drivers/sh/intc/of_intc.c
index 1d5f47e..8dfded3 100644
--- a/drivers/sh/intc/of_intc.c
+++ b/drivers/sh/intc/of_intc.c
@@ -330,7 +330,7 @@ static int __init of_sh_intc_get_prio(struct device_node *np,
 
 		reg_node = of_find_node_by_name(intc_node, node_name);
 
-		if (!intc_node) {
+		if (!reg_node) {
 			pr_err("INTC prio register not found\n");
 			ret = -EINVAL;
 			goto error;
@@ -386,7 +386,7 @@ static int __init of_sh_intc_get_sense(struct device_node *np,
 
 		reg_node = of_find_node_by_name(intc_node, node_name);
 
-		if (!intc_node) {
+		if (!reg_node) {
 			pr_err("INTC senses register not found\n");
 			ret = -EINVAL;
 			goto error;


WARNING: multiple messages have this Message-ID (diff)
From: Julia Lawall <Julia.Lawall@lip6.fr>
To: Paul Mundt <lethal@linux-sh.org>
Cc: kernel-janitors@vger.kernel.org,
	Simon Horman <horms@verge.net.au>,
	Magnus Damm <magnus.damm@gmail.com>,
	linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/15] drivers/sh/intc/of_intc.c: adjust duplicate test
Date: Mon, 21 Jan 2013 14:02:45 +0100	[thread overview]
Message-ID: <1358773378-4700-2-git-send-email-Julia.Lawall@lip6.fr> (raw)
In-Reply-To: <1358773378-4700-1-git-send-email-Julia.Lawall@lip6.fr>

From: Julia Lawall <Julia.Lawall@lip6.fr>

Delete successive tests to the same location.  In this case intc_node has
already been tested for being NULL, and calling of_find_node_by_name will
not make it NULL.  On the other hand, of_find_node_by_name can return NULL
on failure.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@s exists@
local idexpression y;
expression x,e;
@@

*if ( \(x == NULL\|IS_ERR(x)\|y != 0\) )
 { ... when forall
   return ...; }
... when != \(y = e\|y += e\|y -= e\|y |= e\|y &= e\|y++\|y--\|&y\)
    when != \(XT_GETPAGE(...,y)\|WMI_CMD_BUF(...)\)
*if ( \(x == NULL\|IS_ERR(x)\|y != 0\) )
 { ... when forall
   return ...; }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/sh/intc/of_intc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/sh/intc/of_intc.c b/drivers/sh/intc/of_intc.c
index 1d5f47e..8dfded3 100644
--- a/drivers/sh/intc/of_intc.c
+++ b/drivers/sh/intc/of_intc.c
@@ -330,7 +330,7 @@ static int __init of_sh_intc_get_prio(struct device_node *np,
 
 		reg_node = of_find_node_by_name(intc_node, node_name);
 
-		if (!intc_node) {
+		if (!reg_node) {
 			pr_err("INTC prio register not found\n");
 			ret = -EINVAL;
 			goto error;
@@ -386,7 +386,7 @@ static int __init of_sh_intc_get_sense(struct device_node *np,
 
 		reg_node = of_find_node_by_name(intc_node, node_name);
 
-		if (!intc_node) {
+		if (!reg_node) {
 			pr_err("INTC senses register not found\n");
 			ret = -EINVAL;
 			goto error;


  parent reply	other threads:[~2013-01-21 12:16 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-21 12:03 [PATCH 0/14] adjust duplicate test Julia Lawall
2013-01-21 13:02 ` Julia Lawall
2013-01-21 12:03 ` [PATCH 11/15] tools/lib/traceevent/event-parse.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-23 14:42   ` Steven Rostedt
2013-01-23 14:42     ` Steven Rostedt
2013-01-23 21:56     ` Arnaldo Carvalho de Melo
2013-01-23 21:56       ` Arnaldo Carvalho de Melo
2013-01-21 12:12 ` [PATCH 5/15] drivers/scsi/bnx2fc/bnx2fc_io.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 23:05   ` Bhanu Prakash Gollapudi
2013-01-21 23:05     ` Bhanu Prakash Gollapudi
2013-01-21 12:12 ` [PATCH 4/15] drivers/net/ethernet/sfc/ptp.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 19:47   ` Ben Hutchings
2013-01-21 19:47     ` Ben Hutchings
2013-01-21 20:45   ` David Miller
2013-01-21 20:45     ` David Miller
2013-01-21 12:13 ` [PATCH 7/15] drivers/crypto/atmel-aes.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 18:19   ` David Miller
2013-01-21 18:19     ` David Miller
2013-01-21 18:19     ` David Miller
2013-02-04 13:21     ` Herbert Xu
2013-02-04 13:21       ` Herbert Xu
2013-02-04 13:21       ` Herbert Xu
2013-01-21 12:13 ` [PATCH 8/15] arch/powerpc/platforms/85xx/p1022_ds.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-02-15 20:02   ` Kumar Gala
2013-02-15 20:02     ` Kumar Gala
2013-02-15 20:02     ` Kumar Gala
2013-01-21 12:13 ` [PATCH 12/15] fs/hostfs/hostfs_kern.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 12:13 ` [PATCH 10/15] drivers/scsi/csiostor/csio_lnode.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-23  3:59   ` Naresh Kumar Inna
2013-01-23  4:11     ` Naresh Kumar Inna
2013-01-21 12:13 ` [PATCH 9/14] drivers/ipack/devices/ipoctal.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 12:14 ` [PATCH 13/15] drivers/usb/musb/omap2430.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 12:28   ` Felipe Balbi
2013-01-21 12:28     ` Felipe Balbi
2013-01-21 12:28     ` Felipe Balbi
2013-01-21 21:45   ` Sergei Shtylyov
2013-01-21 21:45     ` Sergei Shtylyov
2013-01-21 12:14 ` [PATCH 14/15] drivers/infiniband/hw/mlx4/sysfs.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 12:15 ` [PATCH 6/15] drivers/net/wireless/iwlegacy/4965-mac.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 12:07   ` Stanislaw Gruszka
2013-01-21 12:07     ` Stanislaw Gruszka
2013-01-21 12:16 ` [PATCH 2/15] drivers/usb/chipidea/core.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 23:44   ` Peter Chen
2013-01-21 23:44     ` Peter Chen
2013-01-21 12:16 ` [PATCH 3/15] drivers/staging/omap-thermal/omap-bandgap.c: " Julia Lawall
2013-01-21 13:02   ` Julia Lawall
2013-01-21 12:24   ` walter harms
2013-01-21 12:57   ` Dan Carpenter
2013-01-21 12:59   ` Julia Lawall
2013-01-21 12:16 ` Julia Lawall [this message]
2013-01-21 13:02   ` [PATCH 1/15] drivers/sh/intc/of_intc.c: " Julia Lawall

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358773378-4700-2-git-send-email-Julia.Lawall@lip6.fr \
    --to=julia.lawall@lip6.fr \
    --cc=horms@verge.net.au \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=lethal@linux-sh.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.