[PATCH 08/13] staging/hv: use struct vmbus_channel_interface

[joe at perches.com (Joe Perches)]

Signed-off-by: Joe Perches <joe at perches.com>
---
 drivers/staging/hv/ChannelInterface.c |    3 ++-
 drivers/staging/hv/ChannelInterface.h |    3 ++-
 drivers/staging/hv/Vmbus.c            |    4 ++--
 drivers/staging/hv/include/VmbusApi.h |   10 +++++-----
 drivers/staging/hv/include/vmbus.h    |    2 +-
 drivers/staging/hv/vmbus_drv.c        |    2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c
index 4de58dd..e15d1d7 100644
--- a/drivers/staging/hv/ChannelInterface.c
+++ b/drivers/staging/hv/ChannelInterface.c
@@ -112,7 +112,8 @@ static int IVmbusChannelTeardownGpadl(struct hv_device *Device, u32 GpadlHandle)
 
 }
 
-static void GetChannelInterface(VMBUS_CHANNEL_INTERFACE * ChannelInterface)
+static void
+GetChannelInterface(struct vmbus_channel_interface *ChannelInterface)
 {
 	ChannelInterface->Open = IVmbusChannelOpen;
 	ChannelInterface->Close = IVmbusChannelClose;
diff --git a/drivers/staging/hv/ChannelInterface.h b/drivers/staging/hv/ChannelInterface.h
index ac94033..fd80076 100644
--- a/drivers/staging/hv/ChannelInterface.h
+++ b/drivers/staging/hv/ChannelInterface.h
@@ -26,7 +26,8 @@
 
 #include "include/VmbusApi.h"
 
-static void GetChannelInterface(VMBUS_CHANNEL_INTERFACE * ChannelInterface);
+static void
+GetChannelInterface(struct vmbus_channel_interface *ChannelInterface);
 
 static void GetChannelInfo(struct hv_device *Device,
 			   struct device_info *DeviceInfo);
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index 5de1114..e1faf33 100644
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -53,7 +53,7 @@ static struct hv_device *gDevice;	/* vmbus root device */
 
 /* Internal routines */
 
-static void VmbusGetChannelInterface(VMBUS_CHANNEL_INTERFACE * Interface);
+static void VmbusGetChannelInterface(struct vmbus_channel_interface *Interface);
 
 static void
 VmbusGetChannelInfo(struct hv_device *DeviceObject,
@@ -158,7 +158,7 @@ Description:
 	Get the channel interface
 
 --*/
-static void VmbusGetChannelInterface(VMBUS_CHANNEL_INTERFACE * Interface)
+static void VmbusGetChannelInterface(struct vmbus_channel_interface *Interface)
 {
 	GetChannelInterface(Interface);
 }
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index 066402e..898b44a 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -165,7 +165,7 @@ struct device_info {
 typedef void (*VMBUS_GET_CHANNEL_INFO) (struct hv_device * Device,
 					struct device_info *DeviceInfo);
 
-typedef struct _VMBUS_CHANNEL_INTERFACE {
+struct vmbus_channel_interface {
 	VMBUS_CHANNEL_OPEN Open;
 	VMBUS_CHANNEL_CLOSE Close;
 	VMBUS_CHANNEL_SEND_PACKET SendPacket;
@@ -176,10 +176,10 @@ typedef struct _VMBUS_CHANNEL_INTERFACE {
 	VMBUS_CHANNEL_ESTABLISH_GPADL EstablishGpadl;
 	VMBUS_CHANNEL_TEARDOWN_GPADL TeardownGpadl;
 	VMBUS_GET_CHANNEL_INFO GetInfo;
-} VMBUS_CHANNEL_INTERFACE;
+};
 
-typedef void (*VMBUS_GET_CHANNEL_INTERFACE) (VMBUS_CHANNEL_INTERFACE *
-					     Interface);
+typedef void (*VMBUS_GET_CHANNEL_INTERFACE)
+		(struct vmbus_channel_interface *Interface);
 
 /* Base driver object */
 struct driver_object {
@@ -191,7 +191,7 @@ struct driver_object {
 	PFN_ON_GETDEVICEIDS OnGetDeviceIds;	/* device ids supported by this driver */
 	PFN_ON_CLEANUP OnCleanup;
 
-	VMBUS_CHANNEL_INTERFACE VmbusChannelInterface;
+	struct vmbus_channel_interface VmbusChannelInterface;
 };
 
 /* Base device object */
diff --git a/drivers/staging/hv/include/vmbus.h b/drivers/staging/hv/include/vmbus.h
index 586e186..4c948da 100644
--- a/drivers/staging/hv/include/vmbus.h
+++ b/drivers/staging/hv/include/vmbus.h
@@ -82,6 +82,6 @@ int vmbus_child_driver_register(struct driver_context *driver_ctx);
 
 void vmbus_child_driver_unregister(struct driver_context *driver_ctx);
 
-void vmbus_get_interface(VMBUS_CHANNEL_INTERFACE * interface);
+void vmbus_get_interface(struct vmbus_channel_interface *interface);
 
 #endif /* _VMBUS_H_ */
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 00cd44d..43c7f36 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -511,7 +511,7 @@ Name:	vmbus_get_interface()
 Desc:	Get the vmbus channel interface. This is invoked by child/client driver that sits
 		above vmbus
 --*/
-void vmbus_get_interface(VMBUS_CHANNEL_INTERFACE * interface)
+void vmbus_get_interface(struct vmbus_channel_interface *interface)
 {
 	struct vmbus_driver_object *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
 
-- 
1.6.3.1.10.g659a0.dirty