Merge branch 'master'

[firefly-linux-kernel-4.4.55.git] / drivers / w1 / w1.c

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 4e98ab1aa2f2f86ea11358a67cb07b76d89d41b6..14016b1cd9488337fa752f7561889d0fa6b3b434 100644 (file)
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -77,8 +77,7 @@ static void w1_master_release(struct device *dev)
 
        dev_dbg(dev, "%s: Releasing %s.\n", __func__, md->name);
 
-       if (md->nls && md->nls->sk_socket)
-               sock_release(md->nls->sk_socket);
+       dev_fini_netlink(md);
        memset(md, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
        kfree(md);
 }
@@ -527,8 +526,6 @@ 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;
 }
 
@@ -536,7 +533,7 @@ 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);
 
@@ -579,7 +576,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);
        }
@@ -768,7 +765,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) {
@@ -780,7 +777,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);
                        }