diff options
| author | David Fries <david@fries.net> | 2008-10-15 22:04:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 11:21:49 -0700 |
| commit | cd7b28d33d0cabdc86fa7d546da07b9385274bbb (patch) | |
| tree | ef8afe60407d37a8ecb0f5ee9efacbbd91616229 /drivers/w1 | |
| parent | 9b46741119590bf23c5c519b49024eb2001cfafa (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')
| -rw-r--r-- | drivers/w1/w1.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index f3be2991e6e..b1b21df835f 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) static void w1_slave_found(struct w1_master *dev, u64 rn) { - int slave_count; struct w1_slave *sl; - struct list_head *ent; struct w1_reg_num *tmp; u64 rn_le = cpu_to_le64(rn); @@ -855,24 +853,12 @@ static void w1_slave_found(struct w1_master *dev, u64 rn) tmp = (struct w1_reg_num *) &rn; - slave_count = 0; - list_for_each(ent, &dev->slist) { - - sl = list_entry(ent, struct w1_slave, w1_slave_entry); - - if (sl->reg_num.family == tmp->family && - sl->reg_num.id == tmp->id && - sl->reg_num.crc == tmp->crc) { - set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags); - break; - } - - slave_count++; - } - - if (slave_count == dev->slave_count && - rn && ((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn_le, 7)) { - w1_attach_slave_device(dev, tmp); + sl = w1_slave_search_device(dev, tmp); + if (sl) { + set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags); + } else { + if (rn && tmp->crc == w1_calc_crc8((u8 *)&rn_le, 7)) + w1_attach_slave_device(dev, tmp); } atomic_dec(&dev->refcnt); |