aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEvgeniy Polyakov <johnpol@2ka.mipt.ru>2008-02-06 04:38:07 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:10 -0500
commit18a2354db7d7e43da08c0351263fd5b5fc20a38d (patch)
tree62d5eac10f24ebce9b4ab1b0dde59f6121064026 /drivers
parente1d42c983ff7ba4b55d8635899186ae2ef2578ad (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/w1/w1.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 33e50310e9e0..7293c9b11f91 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u64 rn)
675 struct w1_slave *sl; 675 struct w1_slave *sl;
676 struct list_head *ent; 676 struct list_head *ent;
677 struct w1_reg_num *tmp; 677 struct w1_reg_num *tmp;
678 int family_found = 0;
679 struct w1_master *dev; 678 struct w1_master *dev;
680 u64 rn_le = cpu_to_le64(rn); 679 u64 rn_le = cpu_to_le64(rn);
681 680
@@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u64 rn)
698 sl->reg_num.crc == tmp->crc) { 697 sl->reg_num.crc == tmp->crc) {
699 set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags); 698 set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
700 break; 699 break;
701 } else if (sl->reg_num.family == tmp->family) {
702 family_found = 1;
703 break;
704 } 700 }
705 701
706 slave_count++; 702 slave_count++;