aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1.c
diff options
context:
space:
mode:
authorDavid Fries <david@fries.net>2008-10-16 01:04:44 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:49 -0400
commitcd7b28d33d0cabdc86fa7d546da07b9385274bbb (patch)
treeef8afe60407d37a8ecb0f5ee9efacbbd91616229 /drivers/w1/w1.c
parent9b46741119590bf23c5c519b49024eb2001cfafa (diff)
W1: recode w1_slave_found logic
Simplified the logic in w1_slave_found by using the new w1_attach_slave_device function to find a slave and mark it as active or add the device if the crc checks. Signed-off-by: David Fries <david@fries.net> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1/w1.c')
-rw-r--r--drivers/w1/w1.c26
1 files changed, 6 insertions, 20 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index f3be2991e6e8..b1b21df835f5 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -845,9 +845,7 @@ void w1_reconnect_slaves(struct w1_family *f, int attach)
845 845
846static void w1_slave_found(struct w1_master *dev, u64 rn) 846static void w1_slave_found(struct w1_master *dev, u64 rn)
847{ 847{
848 int slave_count;
849 struct w1_slave *sl; 848 struct w1_slave *sl;
850 struct list_head *ent;
851 struct w1_reg_num *tmp; 849 struct w1_reg_num *tmp;
852 u64 rn_le = cpu_to_le64(rn); 850 u64 rn_le = cpu_to_le64(rn);
853 851
@@ -855,24 +853,12 @@ static void w1_slave_found(struct w1_master *dev, u64 rn)
855 853
856 tmp = (struct w1_reg_num *) &rn; 854 tmp = (struct w1_reg_num *) &rn;
857 855
858 slave_count = 0; 856 sl = w1_slave_search_device(dev, tmp);
859 list_for_each(ent, &dev->slist) { 857 if (sl) {
860 858 set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
861 sl = list_entry(ent, struct w1_slave, w1_slave_entry); 859 } else {
862 860 if (rn && tmp->crc == w1_calc_crc8((u8 *)&rn_le, 7))
863 if (sl->reg_num.family == tmp->family && 861 w1_attach_slave_device(dev, tmp);
864 sl->reg_num.id == tmp->id &&
865 sl->reg_num.crc == tmp->crc) {
866 set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
867 break;
868 }
869
870 slave_count++;
871 }
872
873 if (slave_count == dev->slave_count &&
874 rn && ((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn_le, 7)) {
875 w1_attach_slave_device(dev, tmp);
876 } 862 }
877 863
878 atomic_dec(&dev->refcnt); 864 atomic_dec(&dev->refcnt);