iio: light: isl29501: Simplify code to kill compiler warning
With gcc 4.1.2: drivers/iio/proximity/isl29501.c: In function ‘isl29501_register_write’: drivers/iio/proximity/isl29501.c:235: warning: ‘msb’ may be used uninitialized in this function While this is a false positive, it can easily be avoided by removing the "msb" intermediate variable. Remove the "lsb" intermediate variable for consistency. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>hifive-unleashed-5.1
parent
8ba0dbfd07
commit
24493cce03
|
@ -232,7 +232,6 @@ static u32 isl29501_register_write(struct isl29501_private *isl29501,
|
||||||
u32 value)
|
u32 value)
|
||||||
{
|
{
|
||||||
const struct isl29501_register_desc *reg = &isl29501_registers[name];
|
const struct isl29501_register_desc *reg = &isl29501_registers[name];
|
||||||
u8 msb, lsb;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!reg->msb && value > U8_MAX)
|
if (!reg->msb && value > U8_MAX)
|
||||||
|
@ -241,22 +240,15 @@ static u32 isl29501_register_write(struct isl29501_private *isl29501,
|
||||||
if (value > U16_MAX)
|
if (value > U16_MAX)
|
||||||
return -ERANGE;
|
return -ERANGE;
|
||||||
|
|
||||||
if (!reg->msb) {
|
|
||||||
lsb = value & 0xFF;
|
|
||||||
} else {
|
|
||||||
msb = (value >> 8) & 0xFF;
|
|
||||||
lsb = value & 0xFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
mutex_lock(&isl29501->lock);
|
mutex_lock(&isl29501->lock);
|
||||||
if (reg->msb) {
|
if (reg->msb) {
|
||||||
ret = i2c_smbus_write_byte_data(isl29501->client,
|
ret = i2c_smbus_write_byte_data(isl29501->client,
|
||||||
reg->msb, msb);
|
reg->msb, value >> 8);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = i2c_smbus_write_byte_data(isl29501->client, reg->lsb, lsb);
|
ret = i2c_smbus_write_byte_data(isl29501->client, reg->lsb, value);
|
||||||
|
|
||||||
err:
|
err:
|
||||||
mutex_unlock(&isl29501->lock);
|
mutex_unlock(&isl29501->lock);
|
||||||
|
|
Loading…
Reference in New Issue