From patchwork Mon Jan 21 13:02:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 2011921 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DD8DA3FD1A for ; Mon, 21 Jan 2013 12:16:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753797Ab3AUMQO (ORCPT ); Mon, 21 Jan 2013 07:16:14 -0500 Received: from mail4-relais-sop.national.inria.fr ([192.134.164.105]:41316 "EHLO mail4-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752964Ab3AUMDL (ORCPT ); Mon, 21 Jan 2013 07:03:11 -0500 X-IronPort-AV: E=Sophos;i="4.84,506,1355094000"; d="scan'208";a="169187830" Received: from palace.lip6.fr (HELO localhost.localdomain) ([132.227.105.202]) by mail4-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 21 Jan 2013 13:03:05 +0100 From: Julia Lawall To: Paul Mundt Cc: kernel-janitors@vger.kernel.org, Simon Horman , Magnus Damm , 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 Message-Id: <1358773378-4700-2-git-send-email-Julia.Lawall@lip6.fr> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1358773378-4700-1-git-send-email-Julia.Lawall@lip6.fr> References: <1358773378-4700-1-git-send-email-Julia.Lawall@lip6.fr> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Julia Lawall 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/) // @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 ...; } // Signed-off-by: Julia Lawall --- drivers/sh/intc/of_intc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;