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>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index dfb6644028c0..47249a30eae3 100644
--- 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;
         }