diff options
-rw-r--r-- | drivers/w1/w1.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 4e98ab1aa2f2..1b6b74c116a9 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
@@ -527,8 +527,6 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) | |||
527 | msg.type = W1_SLAVE_ADD; | 527 | msg.type = W1_SLAVE_ADD; |
528 | w1_netlink_send(dev, &msg); | 528 | w1_netlink_send(dev, &msg); |
529 | 529 | ||
530 | dev_info(&dev->dev, "Finished %s for sl=%p.\n", __func__, sl); | ||
531 | |||
532 | return 0; | 530 | return 0; |
533 | } | 531 | } |
534 | 532 | ||
@@ -536,7 +534,7 @@ static void w1_slave_detach(struct w1_slave *sl) | |||
536 | { | 534 | { |
537 | struct w1_netlink_msg msg; | 535 | struct w1_netlink_msg msg; |
538 | 536 | ||
539 | dev_info(&sl->dev, "%s: detaching %s [%p].\n", __func__, sl->name, sl); | 537 | dev_dbg(&sl->dev, "%s: detaching %s [%p].\n", __func__, sl->name, sl); |
540 | 538 | ||
541 | list_del(&sl->w1_slave_entry); | 539 | list_del(&sl->w1_slave_entry); |
542 | 540 | ||
@@ -579,7 +577,7 @@ void w1_reconnect_slaves(struct w1_family *f) | |||
579 | 577 | ||
580 | spin_lock_bh(&w1_mlock); | 578 | spin_lock_bh(&w1_mlock); |
581 | list_for_each_entry(dev, &w1_masters, w1_master_entry) { | 579 | list_for_each_entry(dev, &w1_masters, w1_master_entry) { |
582 | dev_info(&dev->dev, "Reconnecting slaves in %s into new family %02x.\n", | 580 | dev_dbg(&dev->dev, "Reconnecting slaves in %s into new family %02x.\n", |
583 | dev->name, f->fid); | 581 | dev->name, f->fid); |
584 | set_bit(W1_MASTER_NEED_RECONNECT, &dev->flags); | 582 | set_bit(W1_MASTER_NEED_RECONNECT, &dev->flags); |
585 | } | 583 | } |
@@ -768,7 +766,7 @@ static int w1_control(void *data) | |||
768 | } | 766 | } |
769 | 767 | ||
770 | if (test_bit(W1_MASTER_NEED_RECONNECT, &dev->flags)) { | 768 | if (test_bit(W1_MASTER_NEED_RECONNECT, &dev->flags)) { |
771 | dev_info(&dev->dev, "Reconnecting slaves in device %s.\n", dev->name); | 769 | dev_dbg(&dev->dev, "Reconnecting slaves in device %s.\n", dev->name); |
772 | down(&dev->mutex); | 770 | down(&dev->mutex); |
773 | list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) { | 771 | list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) { |
774 | if (sl->family->fid == W1_FAMILY_DEFAULT) { | 772 | if (sl->family->fid == W1_FAMILY_DEFAULT) { |
@@ -780,7 +778,7 @@ static int w1_control(void *data) | |||
780 | w1_attach_slave_device(dev, &rn); | 778 | w1_attach_slave_device(dev, &rn); |
781 | } | 779 | } |
782 | } | 780 | } |
783 | dev_info(&dev->dev, "Reconnecting slaves in device %s has been finished.\n", dev->name); | 781 | dev_dbg(&dev->dev, "Reconnecting slaves in device %s has been finished.\n", dev->name); |
784 | clear_bit(W1_MASTER_NEED_RECONNECT, &dev->flags); | 782 | clear_bit(W1_MASTER_NEED_RECONNECT, &dev->flags); |
785 | up(&dev->mutex); | 783 | up(&dev->mutex); |
786 | } | 784 | } |