UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Hank Janssen 2011-03-29 13:58:49 -07:00 committed by Greg Kroah-Hartman
parent eb335bc427
commit af7a5b6e59
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/hv/hv_kvp.c
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 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/net.h>
#include <linux/nls.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; message = (struct hv_ku_msg *)msg->data;
if (msg->seq == KVP_REGISTER) { if (msg->seq == KVP_REGISTER) {
printk(KERN_INFO "KVP: user-mode registering done.\n"); pr_info("KVP: user-mode registering done.\n");
kvp_register(); kvp_register();
} }
@ -174,7 +174,7 @@ kvp_respond_to_host(char *key, char *value, int error)
/* /*
* This is a spurious call! * This is a spurious call!
*/ */
printk(KERN_WARNING "KVP: Transaction not active\n"); pr_warn("KVP: Transaction not active\n");
return; return;
} }
/* /*

17
drivers/staging/hv/hv_util.c
View File

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