aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/omap-thermal
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-01-21 14:02:47 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-21 14:00:10 -0800
commit82ebecc503d3d76a4d56d7a9b00d87543a28b3e3 (patch)
treea83a9e007946f14918b12036cf7937864ebd1948 /drivers/staging/omap-thermal
parentstaging: tidspbridge/pmgr: another using strlcpy instead of strncpy (diff)
downloadlinux-dev-82ebecc503d3d76a4d56d7a9b00d87543a28b3e3.tar.xz
linux-dev-82ebecc503d3d76a4d56d7a9b00d87543a28b3e3.zip
staging: omap-thermal/omap-bandgap.c: adjust duplicate test
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>
Diffstat (limited to 'drivers/staging/omap-thermal')
-rw-r--r--drivers/staging/omap-thermal/omap-bandgap.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/omap-thermal/omap-bandgap.c b/drivers/staging/omap-thermal/omap-bandgap.c
index 8346e3450f83..89f7180b5e01 100644
--- a/drivers/staging/omap-thermal/omap-bandgap.c
+++ b/drivers/staging/omap-thermal/omap-bandgap.c
@@ -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;