Staging: hv: move logging.h

Move it out of the include subdirectory.

No code changes here, just file movements.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 8849e23..d303cbd 100644 (file)
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -24,8 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #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 d526390..a940891 100644 (file)
--- a/drivers/staging/hv/ChannelMgmt.c
+++ b/drivers/staging/hv/ChannelMgmt.c
@@ -25,8 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #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 d8ff49d..d4d355e 100644 (file)
--- a/drivers/staging/hv/Connection.c
+++ b/drivers/staging/hv/Connection.c
@@ -26,7 +26,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #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 3800bf3..b61b35c 100644 (file)
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
@@ -25,7 +25,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #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 9747ad7..fb1cbf0 100644 (file)
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #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 7473f91..f69ae33 100644 (file)
--- a/drivers/staging/hv/RingBuffer.c
+++ b/drivers/staging/hv/RingBuffer.c
@@ -24,7 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #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 3a44480..1c2f157 100644 (file)
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -27,7 +27,7 @@
 #include <asm/io.h>
 
 #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 edb3ab6..82686da 100644 (file)
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -26,7 +26,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #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 b3004cb..5c4c96f 100644 (file)
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -24,7 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #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 8dcc140..e255755 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -34,7 +34,7 @@
 #include <scsi/scsi_dbg.h>
 
 #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 (file)
index 9e55617..0000000
--- 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 <haiyangz@microsoft.com>
- *   Hank Janssen  <hjanssen@microsoft.com>
- *
- */
-
-
-#ifndef _LOGGING_H_
-#define _LOGGING_H_
-
-/* #include <linux/init.h> */
-/* #include <linux/module.h> */
-
-
-#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 (file)
index 0000000..9e55617
--- /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 <haiyangz@microsoft.com>
+ *   Hank Janssen  <hjanssen@microsoft.com>
+ *
+ */
+
+
+#ifndef _LOGGING_H_
+#define _LOGGING_H_
+
+/* #include <linux/init.h> */
+/* #include <linux/module.h> */
+
+
+#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 36d5b50..f10a0cf 100644 (file)
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -37,7 +37,7 @@
 #include <net/pkt_sched.h>
 
 #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 155ba1d..2310282 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -37,7 +37,7 @@
 #include <scsi/scsi_dbg.h>
 
 #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 7d63531..4462d5b 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -29,7 +29,7 @@
 #include <linux/interrupt.h>
 #include <linux/sysctl.h>
 #include "osd.h"
-#include "include/logging.h"
+#include "logging.h"
 #include "vmbus.h"