2008-01-11 12:10:10

by Evgeniy Polyakov

[permalink] [raw]
Subject: [1/1] w1: remove unused and confusing variable.

Hi.

This patch removes variable which actually is not used (except assigning
it a value) and confusing break out of the family checking loop.
Found by Harry J Mason <[email protected]>.

Thank you.

Signed-off-by: Evgeniy Polyakov <[email protected]>

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 0702173..89300e6 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -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++;


--
Evgeniy Polyakov