w1: use pr_* instead of printk

This patch replaces all calls to the "printk" function within the main "w1"
directory by calls to the appropriate "pr_*" function thus addressing
the following warning generated by the checkpatch script:

WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ...
        then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

Signed-off-by: Fjodor Schelichow <fjodor.schelichow@hotmail.com>
Signed-off-by: Roman Sommer <romsom2@yahoo.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 5d7341520544f98727308c3f4f701c90129b1940..592f7edc671ec2beccc863e4c19d973e33e9d95d 100644 (file)
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -1162,28 +1162,26 @@ static int __init w1_init(void)
 {
        int retval;
 
-       printk(KERN_INFO "Driver for 1-wire Dallas network protocol.\n");
+       pr_info("Driver for 1-wire Dallas network protocol.\n");
 
        w1_init_netlink();
 
        retval = bus_register(&w1_bus_type);
        if (retval) {
-               printk(KERN_ERR "Failed to register bus. err=%d.\n", retval);
+               pr_err("Failed to register bus. err=%d.\n", retval);
                goto err_out_exit_init;
        }
 
        retval = driver_register(&w1_master_driver);
        if (retval) {
-               printk(KERN_ERR
-                       "Failed to register master driver. err=%d.\n",
+               pr_err("Failed to register master driver. err=%d.\n",
                        retval);
                goto err_out_bus_unregister;
        }
 
        retval = driver_register(&w1_slave_driver);
        if (retval) {
-               printk(KERN_ERR
-                       "Failed to register slave driver. err=%d.\n",
+               pr_err("Failed to register slave driver. err=%d.\n",
                        retval);
                goto err_out_master_unregister;
        }

diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index 3651ec801f453dc0824af7c56a5b5cf7242e81d0..1dc3051f7d76171e0b9b7b8a3879899086cf5ac6 100644 (file)
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -87,7 +87,7 @@ void w1_unregister_family(struct w1_family *fent)
        w1_reconnect_slaves(fent, 0);
 
        while (atomic_read(&fent->refcnt)) {
-               printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n",
+               pr_info("Waiting for family %u to become free: refcnt=%d.\n",
                                fent->fid, atomic_read(&fent->refcnt));
 
                if (msleep_interruptible(1000))

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index dfb6644028c046ecf6a9b1e827fdd6bfd7054c53..47249a30eae38e4c80078086c3a1b33309e6eeb9 100644 (file)
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -50,8 +50,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
         */
        dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
        if (!dev) {
-               printk(KERN_ERR
-                       "Failed to allocate %zd bytes for new w1 device.\n",
+               pr_err("Failed to allocate %zd bytes for new w1 device.\n",
                        sizeof(struct w1_master));
                return NULL;
        }
@@ -91,7 +90,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
 
        err = device_register(&dev->dev);
        if (err) {
-               printk(KERN_ERR "Failed to register master device. err=%d\n", err);
+               pr_err("Failed to register master device. err=%d\n", err);
                memset(dev, 0, sizeof(struct w1_master));
                kfree(dev);
                dev = NULL;
@@ -120,7 +119,7 @@ int w1_add_master_device(struct w1_bus_master *master)
        if (!(master->touch_bit && master->reset_bus) &&
            !(master->write_bit && master->read_bit) &&
            !(master->write_byte && master->read_byte && master->reset_bus)) {
-               printk(KERN_ERR "w1_add_master_device: invalid function set\n");
+               pr_err("w1_add_master_device: invalid function set\n");
                return(-EINVAL);
        }
 
@@ -254,7 +253,7 @@ void w1_remove_master_device(struct w1_bus_master *bm)
        }
 
        if (!found) {
-               printk(KERN_ERR "Device doesn't exist.\n");
+               pr_err("Device doesn't exist.\n");
                return;
        }
 

diff --git a/drivers/w1/w1_log.h b/drivers/w1/w1_log.h
index 9c7bd62e6bdc05fa5fffcc135b65d6e3c9dc3187..f9eecff23b8d088e9496984abf0c6fd89c12fce0 100644 (file)
--- a/drivers/w1/w1_log.h
+++ b/drivers/w1/w1_log.h
@@ -29,8 +29,8 @@
 #else
 #  define assert(expr) \
         if(unlikely(!(expr))) {                                        \
-        printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n",        \
-       #expr, __FILE__, __func__, __LINE__);                   \
+               pr_err("Assertion failed! %s,%s,%s,line=%d\n",  \
+               #expr, __FILE__, __func__, __LINE__);           \
         }
 #endif
 

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index 351a2978ba72db5571bd56280b2cc86f23188910..dd96562372745ea11bd71d83901039423b24f403 100644 (file)
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -680,8 +680,7 @@ static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp)
                        if (sl)
                                dev = sl->master;
                } else {
-                       printk(KERN_NOTICE
-                               "%s: cn: %x.%x, wrong type: %u, len: %u.\n",
+                       pr_notice("%s: cn: %x.%x, wrong type: %u, len: %u.\n",
                                __func__, cn->id.idx, cn->id.val,
                                msg->type, msg->len);
                        err = -EPROTO;