Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arch/powerpc/platforms/85xx/p1022_ds.c: adjust duplicate test

Delete successive tests to the same location. The code tested the result
of a previous call, that itself was already tested. It is changed to test
the result of the most recent call.

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>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

authored by

Julia Lawall and committed by
Kumar Gala
4700ebd1 db29cd3c

+1 -1
+1 -1
arch/powerpc/platforms/85xx/p1022_ds.c
··· 302 302 goto exit; 303 303 } 304 304 cs1_addr = lbc_br_to_phys(ecm, num_laws, br1); 305 - if (!cs0_addr) { 305 + if (!cs1_addr) { 306 306 pr_err("p1022ds: could not determine physical address for CS1" 307 307 " (BR1=%08x)\n", br1); 308 308 goto exit;