Commit aaf16f7d authored by Ben Werbowyj's avatar Ben Werbowyj Committed by Greg Kroah-Hartman
Browse files

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: default avatarBen Werbowyj <ben.werbowyj@gmail.com>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4c3f97a
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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);