staging: omap-thermal/omap-bandgap.c: adjust duplicate test
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 21 Jan 2013 13:02:47 +0000 (14:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jan 2013 22:00:10 +0000 (14:00 -0800)
Delete successive tests to the same location.  There was a previous test on
ret and it has not been updated since then.

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/omap-thermal/omap-bandgap.c

index 8346e3450f837474ccbe0326772db66d2541e470..89f7180b5e013a1a30f9be4374d7007c3aef842a 100644 (file)
@@ -568,8 +568,6 @@ int omap_bandgap_read_update_interval(struct omap_bandgap *bg_ptr, int id,
 
        tsr = bg_ptr->conf->sensors[id].registers;
        time = omap_bandgap_readl(bg_ptr, tsr->bgap_counter);
-       if (ret)
-               return ret;
        time = (time & tsr->counter_mask) >> __ffs(tsr->counter_mask);
        time = time * 1000 / bg_ptr->clk_rate;