Commit 17104ca2 authored Mar 07, 2019 by Nathan Chancellor Committed by Jonathan Cameron Apr 04, 2019

iio: adc: stmpe-adc: Shuffle an if statement around in stmpe_adc_isr

When building with -Wsometimes-uninitialized, Clang warns:

drivers/iio/adc/stmpe-adc.c:204:13: warning: variable 'data' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]

Clang can't tell that data will never be used uninitialized because the
two if statements take care of all cases. Remove the first if statement
and make it the else branch of the second one so that it is apparent to
Clang that all cases are covered.

Link: https://github.com/ClangBuiltLinux/linux/issues/387

Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: NIck Desaulniers <ndesaulniers@google.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

parent 6f9ca1d3

drivers/iio/adc/stmpe-adc.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -184,9 +184,6 @@ static irqreturn_t stmpe_adc_isr(int irq, void *dev_id)
		struct stmpe_adc info = (struct stmpe_adc )dev_id;
		u16 data;

		if (info->channel > STMPE_TEMP_CHANNEL)
		return IRQ_NONE;

		if (info->channel <= STMPE_ADC_LAST_NR) {
		int int_sta;

		@@ -205,6 +202,8 @@ static irqreturn_t stmpe_adc_isr(int irq, void *dev_id)
		/* Read value */
		stmpe_block_read(info->stmpe, STMPE_REG_TEMP_DATA, 2,
		(u8 *) &data);
		} else {
		return IRQ_NONE;
		}

		info->value = (u32) be16_to_cpu(data);