Skip to content

Commit f61dfff

Browse files
geertujic23
authored andcommitted
iio: pressure: zpa2326: Remove always-true check which confuses gcc
With gcc 4.1.2: drivers/iio/pressure/zpa2326.c: In function ‘zpa2326_wait_oneshot_completion’: drivers/iio/pressure/zpa2326.c:868: warning: ‘ret’ may be used uninitialized in this function When testing for "timeout < 0", timeout is already guaranteed to be strict negative, so the branch is always taken, and ret is thus always initialized. But (some version of) gcc is not smart enough to notice. Remove the check to fix this. As there is no other code in between assigning the error codes and returning them, the error codes can be returned immediately, and the intermediate variable can be dropped. Drop the "else" to please checkpatch. Fixes: e7215fe ("iio: pressure: zpa2326: report interrupted case as failure") Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
1 parent eb35279 commit f61dfff

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

drivers/iio/pressure/zpa2326.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,6 @@ static irqreturn_t zpa2326_handle_threaded_irq(int irq, void *data)
865865
static int zpa2326_wait_oneshot_completion(const struct iio_dev *indio_dev,
866866
struct zpa2326_private *private)
867867
{
868-
int ret;
869868
unsigned int val;
870869
long timeout;
871870

@@ -887,14 +886,11 @@ static int zpa2326_wait_oneshot_completion(const struct iio_dev *indio_dev,
887886
/* Timed out. */
888887
zpa2326_warn(indio_dev, "no one shot interrupt occurred (%ld)",
889888
timeout);
890-
ret = -ETIME;
891-
} else if (timeout < 0) {
892-
zpa2326_warn(indio_dev,
893-
"wait for one shot interrupt cancelled");
894-
ret = -ERESTARTSYS;
889+
return -ETIME;
895890
}
896891

897-
return ret;
892+
zpa2326_warn(indio_dev, "wait for one shot interrupt cancelled");
893+
return -ERESTARTSYS;
898894
}
899895

900896
static int zpa2326_init_managed_irq(struct device *parent,

0 commit comments

Comments
 (0)