Commit 18a2354d authored Feb 06, 2008 by Evgeniy Polyakov Committed by Linus Torvalds Feb 06, 2008

w1: remove unused and confusing variable.



Remvoe variable which actually is not used (except assigning it a value)
and confusing break out of the family checking loop.  Found by Harry Mason.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Harry J Mason <hjm03r@ecs.soton.ac.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e1d42c98

drivers/w1/w1.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u64 rn)
		struct w1_slave *sl;
		struct list_head *ent;
		struct w1_reg_num *tmp;
		int family_found = 0;
		struct w1_master *dev;
		u64 rn_le = cpu_to_le64(rn);

		@@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u64 rn)
		sl->reg_num.crc == tmp->crc) {
		set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
		break;
		} else if (sl->reg_num.family == tmp->family) {
		family_found = 1;
		break;
		}

		slave_count++;