Staging: hv: Move the contents of vmbus.h to hyperv.h

Move the contents of vmbus.h to hyperv.h.

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

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 5059e44..44de488 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -34,7 +34,6 @@
 
 #include "hyperv.h"
 #include "hv_api.h"
-#include "vmbus.h"
 #include "storvsc_api.h"
 
 

diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/staging/hv/hv_kvp.c
index 2595627..fd07dbc 100644 (file)
--- a/drivers/staging/hv/hv_kvp.c
+++ b/drivers/staging/hv/hv_kvp.c
@@ -29,7 +29,6 @@
 
 #include "hyperv.h"
 #include "hv_api.h"
-#include "vmbus.h"
 #include "vmbus_private.h"
 #include "utils.h"
 #include "hv_kvp.h"

diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 82cc685..68bb8d2 100644 (file)
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -28,7 +28,6 @@
 
 #include "hyperv.h"
 #include "hv_api.h"
-#include "vmbus.h"
 
 
 /*

diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index f08f799..d1f7814 100644 (file)
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -31,7 +31,6 @@
 
 #include "hyperv.h"
 #include "hv_api.h"
-#include "vmbus.h"
 #include "vmbus_private.h"
 #include "utils.h"
 #include "hv_kvp.h"

diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h
index 10042b0..b6f5006 100644 (file)
--- a/drivers/staging/hv/hyperv.h
+++ b/drivers/staging/hv/hyperv.h
@@ -822,4 +822,24 @@ struct hv_device {
        void *ext;
 };
 
+#include <linux/device.h>
+
+
+static inline struct hv_device *device_to_hv_device(struct device *d)
+{
+       return container_of(d, struct hv_device, device);
+}
+
+static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d)
+{
+       return container_of(d, struct hv_driver, driver);
+}
+
+
+/* Vmbus interface */
+int vmbus_child_driver_register(struct device_driver *drv);
+void vmbus_child_driver_unregister(struct device_driver *drv);
+
+extern struct completion hv_channel_ready;
+
 #endif /* _HYPERV_H */

diff --git a/drivers/staging/hv/netvsc_api.h b/drivers/staging/hv/netvsc_api.h
index 4689503..ce4c8d2 100644 (file)
--- a/drivers/staging/hv/netvsc_api.h
+++ b/drivers/staging/hv/netvsc_api.h
@@ -26,7 +26,6 @@
 #define _NETVSC_API_H_
 
 #include "hyperv.h"
-#include "vmbus.h"
 
 /* Fwd declaration */
 struct hv_netvsc_packet;

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 6f4aeeb..b732d06 100644 (file)
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -41,7 +41,6 @@
 
 #include "hyperv.h"
 #include "hv_api.h"
-#include "vmbus.h"
 #include "netvsc_api.h"
 
 struct net_device_context {

diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 310712d..394f7e2 100644 (file)
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -29,7 +29,6 @@
 #include <linux/wait.h>
 #include "vstorage.h"
 #include "hyperv.h"
-#include "vmbus.h"
 
 /* Defines */
 #define STORVSC_RING_BUFFER_SIZE                       (20*PAGE_SIZE)

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 852cf63..0a3035b 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -35,7 +35,6 @@
 
 #include "hyperv.h"
 #include "hv_api.h"
-#include "vmbus.h"
 #include "storvsc_api.h"
 #include "vstorage.h"
 

diff --git a/drivers/staging/hv/vmbus.h b/drivers/staging/hv/vmbus.h
deleted file mode 100644 (file)
index 81029fd..0000000
--- a/drivers/staging/hv/vmbus.h
+++ /dev/null
@@ -1,51 +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 _VMBUS_H_
-#define _VMBUS_H_
-
-#include <linux/device.h>
-#include "hyperv.h"
-
-
-
-
-static inline struct hv_device *device_to_hv_device(struct device *d)
-{
-       return container_of(d, struct hv_device, device);
-}
-
-static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d)
-{
-       return container_of(d, struct hv_driver, driver);
-}
-
-
-/* Vmbus interface */
-int vmbus_child_driver_register(struct device_driver *drv);
-void vmbus_child_driver_unregister(struct device_driver *drv);
-
-extern struct completion hv_channel_ready;
-
-#endif /* _VMBUS_H_ */

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 935fab3..042e6df 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -37,7 +37,6 @@
 
 #include "hyperv.h"
 #include "hv_api.h"
-#include "vmbus.h"
 #include "vmbus_private.h"