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

Commit 094a0736 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

macintosh: windfarm: Use unsigned type for 1-bit bitfields 



[ Upstream commit 748ea32d2dbd813d3bd958117bde5191182f909a ]

Clang warns:

  drivers/macintosh/windfarm_lm75_sensor.c:63:14: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
                  lm->inited = 1;
                             ^ ~

  drivers/macintosh/windfarm_smu_sensors.c:356:19: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
                  pow->fake_volts = 1;
                                  ^ ~
  drivers/macintosh/windfarm_smu_sensors.c:368:18: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
                  pow->quadratic = 1;
                                 ^ ~

There is no bug here since no code checks the actual value of these
fields, just whether or not they are zero (boolean context), but this
can be easily fixed by switching to an unsigned type.

Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230215-windfarm-wsingle-bit-bitfield-constant-conversion-v1-1-26415072e855@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 737985db

drivers/macintosh/windfarm_lm75_sensor.c

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#endif



struct wf_lm75_sensor {

	int			ds1775 : 1;

	int			inited : 1;

	unsigned int		ds1775 : 1;

	unsigned int		inited : 1;

	struct i2c_client	*i2c;

	struct wf_sensor	sens;

};

drivers/macintosh/windfarm_smu_sensors.c

+2 −2
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ struct smu_cpu_power_sensor { 
	struct list_head	link;

	struct wf_sensor	*volts;

	struct wf_sensor	*amps;

	int			fake_volts : 1;

	int			quadratic : 1;

	unsigned int		fake_volts : 1;

	unsigned int		quadratic : 1;

	struct wf_sensor	sens;

};

#define to_smu_cpu_power(c) container_of(c, struct smu_cpu_power_sensor, sens)