Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aee3713 authored by Nathan Huckleberry's avatar Nathan Huckleberry Committed by Zhang Rui
Browse files

thermal: armada: Fix -Wshift-negative-value 

Clang produces the following warning

drivers/thermal/armada_thermal.c:270:33: warning: shifting a negative
signed value is undefined [-Wshift-negative-value]
1 warning        reg &= ~CONTROL1_TSEN_AVG_MASK <<
CONTROL1_TSEN_AVG_SHIFT; generated
.
               ~~~~~~~~~~~~~~~~~~~~~~~ ^

CONTROL1_TSEN_AVG_SHIFT is defined to be zero.
Since shifting by zero does nothing this variable can be removed.

Cc: clang-built-linux@googlegroups.com
Link: https://github.com/ClangBuiltLinux/linux/issues/532


Signed-off-by: default avatarNathan Huckleberry <nhuck@google.com>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent d1abaeb3

drivers/thermal/armada_thermal.c

+2 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
#define CONTROL0_TSEN_MODE_EXTERNAL	0x2

#define CONTROL0_TSEN_MODE_MASK		0x3



#define CONTROL1_TSEN_AVG_SHIFT		0

#define CONTROL1_TSEN_AVG_MASK		0x7

#define CONTROL1_EXT_TSEN_SW_RESET	BIT(7)

#define CONTROL1_EXT_TSEN_HW_RESETn	BIT(8)
@@ -267,8 +266,8 @@ static void armada_cp110_init(struct platform_device *pdev, 


	/* Average the output value over 2^1 = 2 samples */

	regmap_read(priv->syscon, data->syscon_control1_off, &reg);

	reg &= ~CONTROL1_TSEN_AVG_MASK << CONTROL1_TSEN_AVG_SHIFT;

	reg |= 1 << CONTROL1_TSEN_AVG_SHIFT;

	reg &= ~CONTROL1_TSEN_AVG_MASK;

	reg |= 1;

	regmap_write(priv->syscon, data->syscon_control1_off, reg);

}