staging: hv: Replaced DPRINT and printk with native functions in hv_utils

Replaced all DPRINT and printk calls with pr_ calls

Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/staging/hv/hv_kvp.c
index 7775820..c71a148 100644 (file)
--- a/drivers/staging/hv/hv_kvp.c
+++ b/drivers/staging/hv/hv_kvp.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/net.h>
 #include <linux/nls.h>
@@ -114,7 +114,7 @@ kvp_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
 
        message = (struct hv_ku_msg *)msg->data;
        if (msg->seq == KVP_REGISTER) {
-               printk(KERN_INFO "KVP: user-mode registering done.\n");
+               pr_info("KVP: user-mode registering done.\n");
                kvp_register();
        }
 
@@ -174,7 +174,7 @@ kvp_respond_to_host(char *key, char *value, int error)
                /*
                 * This is a spurious call!
                 */
-               printk(KERN_WARNING "KVP: Transaction not active\n");
+               pr_warn("KVP: Transaction not active\n");
                return;
        }
        /*

diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index 3e74f79..3af0a11 100644 (file)
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -18,6 +18,8 @@
  *   Haiyang Zhang <haiyangz@microsoft.com>
  *   Hank Janssen  <hjanssen@microsoft.com>
  */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -76,15 +78,15 @@ static void shutdown_onchannelcallback(void *context)
                                icmsghdrp->status = HV_S_OK;
                                execute_shutdown = true;
 
-                               DPRINT_INFO(VMBUS, "Shutdown request received -"
-                                           " gracefull shutdown initiated");
+                               pr_info("Shutdown request received -"
+                                           " gracefull shutdown initiated\n");
                                break;
                        default:
                                icmsghdrp->status = HV_E_FAIL;
                                execute_shutdown = false;
 
-                               DPRINT_INFO(VMBUS, "Shutdown request received -"
-                                           " Invalid request");
+                               pr_info("Shutdown request received -"
+                                           " Invalid request\n");
                                break;
                        };
                }
@@ -242,7 +244,7 @@ MODULE_DEVICE_TABLE(dmi, hv_utils_dmi_table);
 
 static int __init init_hyperv_utils(void)
 {
-       printk(KERN_INFO "Registering HyperV Utility Driver\n");
+       pr_info("Registering HyperV Utility Driver\n");
 
        if (hv_kvp_init())
                return -ENODEV;
@@ -256,8 +258,7 @@ static int __init init_hyperv_utils(void)
        hbeat_txf_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
 
        if (!shut_txf_buf || !time_txf_buf || !hbeat_txf_buf) {
-               printk(KERN_INFO
-                      "Unable to allocate memory for receive buffer\n");
+               pr_info("Unable to allocate memory for receive buffer\n");
                kfree(shut_txf_buf);
                kfree(time_txf_buf);
                kfree(hbeat_txf_buf);
@@ -286,7 +287,7 @@ static int __init init_hyperv_utils(void)
 
 static void exit_hyperv_utils(void)
 {
-       printk(KERN_INFO "De-Registered HyperV Utility Driver\n");
+       pr_info("De-Registered HyperV Utility Driver\n");
 
        hv_cb_utils[HV_SHUTDOWN_MSG].channel->onchannel_callback =
                &chn_cb_negotiate;