summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorBen Werbowyj <ben.werbowyj@gmail.com>2016-07-22 14:33:34 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-31 13:56:04 +0200
commitaaf16f7d98fedb24099361492821fcdc77036eab (patch)
tree19dd5ac9a43480ecc6c8ad11acae80a90f57989d /drivers/w1
parentd4c3f97a062969ce52ecc5428e3dbbe93c157dd2 (diff)
downloadlinux-stable-aaf16f7d98fedb24099361492821fcdc77036eab.tar.gz
linux-stable-aaf16f7d98fedb24099361492821fcdc77036eab.tar.bz2
linux-stable-aaf16f7d98fedb24099361492821fcdc77036eab.zip
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>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/slaves/w1_therm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index efe9d2154a1a..83a5036b990b 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -335,7 +335,8 @@ static inline int w1_DS18B20_precision(struct device *device, int val)
/* read values to only alter precision bits */
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);
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)) {
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);