From: Greg Kroah-Hartman Date: Fri, 28 Aug 2009 23:22:59 +0000 (-0700) Subject: Staging: hv: move logging.h X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=645954c54287faee983d37705b80e9ae90c63782;p=linux.git Staging: hv: move logging.h Move it out of the include subdirectory. No code changes here, just file movements. Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index 8849e23065f13..d303cbd4c5369 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c @@ -24,8 +24,7 @@ #include #include #include "osd.h" -#include "include/logging.h" - +#include "logging.h" #include "VmbusPrivate.h" /* Internal routines */ diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index d526390b7061d..a940891d82657 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c @@ -25,8 +25,7 @@ #include #include #include "osd.h" -#include "include/logging.h" - +#include "logging.h" #include "VmbusPrivate.h" /* Data types */ diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c index d8ff49d5b71e8..d4d355e6b7c22 100644 --- a/drivers/staging/hv/Connection.c +++ b/drivers/staging/hv/Connection.c @@ -26,7 +26,7 @@ #include #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "VmbusPrivate.h" /* Globals */ diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index 3800bf324816a..b61b35c39d90c 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c @@ -25,7 +25,7 @@ #include #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "VmbusPrivate.h" /* Globals */ diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 9747ad73a12c2..fb1cbf02ce5a2 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c @@ -25,7 +25,7 @@ #include #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "NetVsc.h" #include "RndisFilter.h" diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c index 7473f915403a1..f69ae33a91e37 100644 --- a/drivers/staging/hv/RingBuffer.c +++ b/drivers/staging/hv/RingBuffer.c @@ -24,7 +24,7 @@ #include #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "RingBuffer.h" diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 3a444800f94b5..1c2f15799d3b9 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -27,7 +27,7 @@ #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "include/NetVscApi.h" #include "RndisFilter.h" diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index edb3ab6d12d6b..82686dae78ac7 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -26,7 +26,7 @@ #include #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "include/StorVscApi.h" #include "include/VmbusPacketFormat.h" #include "vstorage.h" diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index b3004cb9b6c9a..5c4c96f649a88 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c @@ -24,7 +24,7 @@ #include #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "VersionInfo.h" #include "VmbusPrivate.h" diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 8dcc140a5dcab..e255755b09b23 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -34,7 +34,7 @@ #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "vmbus.h" #include "include/StorVscApi.h" diff --git a/drivers/staging/hv/include/logging.h b/drivers/staging/hv/include/logging.h deleted file mode 100644 index 9e55617bd670f..0000000000000 --- a/drivers/staging/hv/include/logging.h +++ /dev/null @@ -1,119 +0,0 @@ -/* - * - * Copyright (c) 2009, Microsoft Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307 USA. - * - * Authors: - * Haiyang Zhang - * Hank Janssen - * - */ - - -#ifndef _LOGGING_H_ -#define _LOGGING_H_ - -/* #include */ -/* #include */ - - -#define VMBUS 0x0001 -#define STORVSC 0x0002 -#define NETVSC 0x0004 -#define INPUTVSC 0x0008 -#define BLKVSC 0x0010 -#define VMBUS_DRV 0x0100 -#define STORVSC_DRV 0x0200 -#define NETVSC_DRV 0x0400 -#define INPUTVSC_DRV 0x0800 -#define BLKVSC_DRV 0x1000 - -#define ALL_MODULES (VMBUS |\ - STORVSC |\ - NETVSC |\ - INPUTVSC |\ - BLKVSC |\ - VMBUS_DRV |\ - STORVSC_DRV |\ - NETVSC_DRV |\ - INPUTVSC_DRV|\ - BLKVSC_DRV) - -/* Logging Level */ -#define ERROR_LVL 3 -#define WARNING_LVL 4 -#define INFO_LVL 6 -#define DEBUG_LVL 7 -#define DEBUG_LVL_ENTEREXIT 8 -#define DEBUG_RING_LVL 9 - -extern unsigned int vmbus_loglevel; - -#define ASSERT(expr) \ - if (!(expr)) { \ - printk(KERN_CRIT "Assertion failed! %s,%s,%s,line=%d\n", \ - #expr, __FILE__, __func__, __LINE__); \ - __asm__ __volatile__("int3"); \ - } - -#define DPRINT(mod, lvl, fmt, args...) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (lvl <= LOWORD(vmbus_loglevel))) \ - printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\ - } while (0) - -#define DPRINT_DBG(mod, fmt, args...) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (DEBUG_LVL <= LOWORD(vmbus_loglevel))) \ - printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\ - } while (0) - -#define DPRINT_INFO(mod, fmt, args...) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (INFO_LVL <= LOWORD(vmbus_loglevel))) \ - printk(KERN_INFO #mod": " fmt "\n", ## args);\ - } while (0) - -#define DPRINT_WARN(mod, fmt, args...) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (WARNING_LVL <= LOWORD(vmbus_loglevel))) \ - printk(KERN_WARNING #mod": WARNING! " fmt "\n", ## args);\ - } while (0) - -#define DPRINT_ERR(mod, fmt, args...) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (ERROR_LVL <= LOWORD(vmbus_loglevel))) \ - printk(KERN_ERR #mod": %s() ERROR!! " fmt "\n", \ - __func__, ## args);\ - } while (0) - -#ifdef DEBUG -#define DPRINT_ENTER(mod) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel))) \ - printk(KERN_DEBUG "["#mod"]: %s() enter\n", __func__);\ - } while (0) - -#define DPRINT_EXIT(mod) do {\ - if ((mod & (HIWORD(vmbus_loglevel))) && \ - (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel))) \ - printk(KERN_DEBUG "["#mod"]: %s() exit\n", __func__);\ - } while (0) -#else -#define DPRINT_ENTER(mod) -#define DPRINT_EXIT(mod) -#endif - -#endif /* _LOGGING_H_ */ diff --git a/drivers/staging/hv/logging.h b/drivers/staging/hv/logging.h new file mode 100644 index 0000000000000..9e55617bd670f --- /dev/null +++ b/drivers/staging/hv/logging.h @@ -0,0 +1,119 @@ +/* + * + * Copyright (c) 2009, Microsoft Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: + * Haiyang Zhang + * Hank Janssen + * + */ + + +#ifndef _LOGGING_H_ +#define _LOGGING_H_ + +/* #include */ +/* #include */ + + +#define VMBUS 0x0001 +#define STORVSC 0x0002 +#define NETVSC 0x0004 +#define INPUTVSC 0x0008 +#define BLKVSC 0x0010 +#define VMBUS_DRV 0x0100 +#define STORVSC_DRV 0x0200 +#define NETVSC_DRV 0x0400 +#define INPUTVSC_DRV 0x0800 +#define BLKVSC_DRV 0x1000 + +#define ALL_MODULES (VMBUS |\ + STORVSC |\ + NETVSC |\ + INPUTVSC |\ + BLKVSC |\ + VMBUS_DRV |\ + STORVSC_DRV |\ + NETVSC_DRV |\ + INPUTVSC_DRV|\ + BLKVSC_DRV) + +/* Logging Level */ +#define ERROR_LVL 3 +#define WARNING_LVL 4 +#define INFO_LVL 6 +#define DEBUG_LVL 7 +#define DEBUG_LVL_ENTEREXIT 8 +#define DEBUG_RING_LVL 9 + +extern unsigned int vmbus_loglevel; + +#define ASSERT(expr) \ + if (!(expr)) { \ + printk(KERN_CRIT "Assertion failed! %s,%s,%s,line=%d\n", \ + #expr, __FILE__, __func__, __LINE__); \ + __asm__ __volatile__("int3"); \ + } + +#define DPRINT(mod, lvl, fmt, args...) do {\ + if ((mod & (HIWORD(vmbus_loglevel))) && \ + (lvl <= LOWORD(vmbus_loglevel))) \ + printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\ + } while (0) + +#define DPRINT_DBG(mod, fmt, args...) do {\ + if ((mod & (HIWORD(vmbus_loglevel))) && \ + (DEBUG_LVL <= LOWORD(vmbus_loglevel))) \ + printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\ + } while (0) + +#define DPRINT_INFO(mod, fmt, args...) do {\ + if ((mod & (HIWORD(vmbus_loglevel))) && \ + (INFO_LVL <= LOWORD(vmbus_loglevel))) \ + printk(KERN_INFO #mod": " fmt "\n", ## args);\ + } while (0) + +#define DPRINT_WARN(mod, fmt, args...) do {\ + if ((mod & (HIWORD(vmbus_loglevel))) && \ + (WARNING_LVL <= LOWORD(vmbus_loglevel))) \ + printk(KERN_WARNING #mod": WARNING! " fmt "\n", ## args);\ + } while (0) + +#define DPRINT_ERR(mod, fmt, args...) do {\ + if ((mod & (HIWORD(vmbus_loglevel))) && \ + (ERROR_LVL <= LOWORD(vmbus_loglevel))) \ + printk(KERN_ERR #mod": %s() ERROR!! " fmt "\n", \ + __func__, ## args);\ + } while (0) + +#ifdef DEBUG +#define DPRINT_ENTER(mod) do {\ + if ((mod & (HIWORD(vmbus_loglevel))) && \ + (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel))) \ + printk(KERN_DEBUG "["#mod"]: %s() enter\n", __func__);\ + } while (0) + +#define DPRINT_EXIT(mod) do {\ + if ((mod & (HIWORD(vmbus_loglevel))) && \ + (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel))) \ + printk(KERN_DEBUG "["#mod"]: %s() exit\n", __func__);\ + } while (0) +#else +#define DPRINT_ENTER(mod) +#define DPRINT_EXIT(mod) +#endif + +#endif /* _LOGGING_H_ */ diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 36d5b5012ae2a..f10a0cf43f3eb 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -37,7 +37,7 @@ #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "vmbus.h" #include "include/NetVscApi.h" diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 155ba1df4b33b..2310282f4c9a9 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -37,7 +37,7 @@ #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "vmbus.h" #include "include/StorVscApi.h" diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 7d6353106697c..4462d5bb87e71 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -29,7 +29,7 @@ #include #include #include "osd.h" -#include "include/logging.h" +#include "logging.h" #include "vmbus.h"