drivers: w1: removed assignment from within if statement
Assignment of variable count removed from within an if statment. This was done at two locations in the file. Signed-off-by: Ben Werbowyj <ben.werbowyj@gmail.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
d4c3f97a06
Коммит
aaf16f7d98
|
@ -335,7 +335,8 @@ static inline int w1_DS18B20_precision(struct device *device, int val)
|
||||||
|
|
||||||
/* read values to only alter precision bits */
|
/* read values to only alter precision bits */
|
||||||
w1_write_8(dev, W1_READ_SCRATCHPAD);
|
w1_write_8(dev, W1_READ_SCRATCHPAD);
|
||||||
if ((count = w1_read_block(dev, rom, 9)) != 9)
|
count = w1_read_block(dev, rom, 9);
|
||||||
|
if (count != 9)
|
||||||
dev_warn(device, "w1_read_block() returned %u instead of 9.\n", count);
|
dev_warn(device, "w1_read_block() returned %u instead of 9.\n", count);
|
||||||
|
|
||||||
crc = w1_calc_crc8(rom, 8);
|
crc = w1_calc_crc8(rom, 8);
|
||||||
|
@ -493,7 +494,8 @@ static ssize_t w1_slave_show(struct device *device,
|
||||||
if (!w1_reset_select_slave(sl)) {
|
if (!w1_reset_select_slave(sl)) {
|
||||||
|
|
||||||
w1_write_8(dev, W1_READ_SCRATCHPAD);
|
w1_write_8(dev, W1_READ_SCRATCHPAD);
|
||||||
if ((count = w1_read_block(dev, rom, 9)) != 9) {
|
count = w1_read_block(dev, rom, 9);
|
||||||
|
if (count != 9) {
|
||||||
dev_warn(device, "w1_read_block() "
|
dev_warn(device, "w1_read_block() "
|
||||||
"returned %u instead of 9.\n",
|
"returned %u instead of 9.\n",
|
||||||
count);
|
count);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче