Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7926
b: refs/heads/master
c: 7c8f570
h: refs/heads/master
v: v3
  • Loading branch information
Evgeniy Polyakov authored and Greg Kroah-Hartman committed Sep 8, 2005
1 parent 3a19f44 commit d04759f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3aca692d3ec7cf89da4575f598e41f74502b22d7
refs/heads/master: 7c8f5703de91ade517d4fd6c3cc8e08dbba2b739
10 changes: 4 additions & 6 deletions trunk/drivers/w1/w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -527,16 +527,14 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
msg.type = W1_SLAVE_ADD;
w1_netlink_send(dev, &msg);

dev_info(&dev->dev, "Finished %s for sl=%p.\n", __func__, sl);

return 0;
}

static void w1_slave_detach(struct w1_slave *sl)
{
struct w1_netlink_msg msg;

dev_info(&sl->dev, "%s: detaching %s [%p].\n", __func__, sl->name, sl);
dev_dbg(&sl->dev, "%s: detaching %s [%p].\n", __func__, sl->name, sl);

list_del(&sl->w1_slave_entry);

Expand Down Expand Up @@ -579,7 +577,7 @@ void w1_reconnect_slaves(struct w1_family *f)

spin_lock_bh(&w1_mlock);
list_for_each_entry(dev, &w1_masters, w1_master_entry) {
dev_info(&dev->dev, "Reconnecting slaves in %s into new family %02x.\n",
dev_dbg(&dev->dev, "Reconnecting slaves in %s into new family %02x.\n",
dev->name, f->fid);
set_bit(W1_MASTER_NEED_RECONNECT, &dev->flags);
}
Expand Down Expand Up @@ -768,7 +766,7 @@ static int w1_control(void *data)
}

if (test_bit(W1_MASTER_NEED_RECONNECT, &dev->flags)) {
dev_info(&dev->dev, "Reconnecting slaves in device %s.\n", dev->name);
dev_dbg(&dev->dev, "Reconnecting slaves in device %s.\n", dev->name);
down(&dev->mutex);
list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
if (sl->family->fid == W1_FAMILY_DEFAULT) {
Expand All @@ -780,7 +778,7 @@ static int w1_control(void *data)
w1_attach_slave_device(dev, &rn);
}
}
dev_info(&dev->dev, "Reconnecting slaves in device %s has been finished.\n", dev->name);
dev_dbg(&dev->dev, "Reconnecting slaves in device %s has been finished.\n", dev->name);
clear_bit(W1_MASTER_NEED_RECONNECT, &dev->flags);
up(&dev->mutex);
}
Expand Down

0 comments on commit d04759f

Please sign in to comment.