From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Date: Mon, 21 Jan 2013 21:45:34 +0000 Subject: Re: [PATCH 13/15] drivers/usb/musb/omap2430.c: adjust duplicate test Message-Id: <50FDB6FE.7010601@mvista.com> List-Id: References: <1358773378-4700-1-git-send-email-Julia.Lawall@lip6.fr> <1358773378-4700-14-git-send-email-Julia.Lawall@lip6.fr> In-Reply-To: <1358773378-4700-14-git-send-email-Julia.Lawall@lip6.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Julia Lawall Cc: Felipe Balbi , kernel-janitors@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org On 21-01-2013 17:02, Julia Lawall wrote: > From: Julia Lawall > Delete successive tests to the same location. Data is the just previously > allocated and tested value. Test the result of the allocation made here > instead. > 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 > --- > The previous code could be further simplified by removing the > initializations of ret to -ENOMEM, as is absent in this case. But that is > probably for another patch. I've already sent such patch and Felipe has queued it. > drivers/usb/musb/omap2430.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c > index da00af4..533c4fd 100644 > --- a/drivers/usb/musb/omap2430.c > +++ b/drivers/usb/musb/omap2430.c > @@ -545,7 +545,7 @@ static int omap2430_probe(struct platform_device *pdev) > } > > config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL); > - if (!data) { > + if (!config) { Same about this change. You're a bit late this time. :-) WBR, Sergei