Staging: hv: remove RecvPacket from struct vmbus_channel_interface

[pandora-kernel.git] / drivers / staging / hv / channel_interface.c

diff --git a/drivers/staging/hv/channel_interface.c b/drivers/staging/hv/channel_interface.c
index d9f51ac..0f8e9f0 100644 (file)
--- a/drivers/staging/hv/channel_interface.c
+++ b/drivers/staging/hv/channel_interface.c
@@ -25,128 +25,54 @@
 #include "osd.h"
 #include "vmbus_private.h"
 
-static int IVmbusChannelOpen(struct hv_device *device, u32 SendBufferSize,
-                            u32 RecvRingBufferSize, void *UserData,
-                            u32 UserDataLen,
-                            void (*ChannelCallback)(void *context),
-                            void *Context)
+static int ivmbus_open(struct hv_device *device, u32 sendbuffer_size,
+                            u32 recv_ringbuffer_size, void *userdata,
+                            u32 userdatalen,
+                            void (*channel_callback)(void *context),
+                            void *context)
 {
-       return VmbusChannelOpen(device->context, SendBufferSize,
-                               RecvRingBufferSize, UserData, UserDataLen,
-                               ChannelCallback, Context);
+       return vmbus_open(device->channel, sendbuffer_size,
+                               recv_ringbuffer_size, userdata, userdatalen,
+                               channel_callback, context);
 }
 
-static void IVmbusChannelClose(struct hv_device *device)
+static void ivmbus_close(struct hv_device *device)
 {
-       VmbusChannelClose(device->context);
+       vmbus_close(device->channel);
 }
 
-static int IVmbusChannelSendPacket(struct hv_device *device, const void *Buffer,
-                                  u32 BufferLen, u64 RequestId, u32 Type,
-                                  u32 Flags)
+static int ivmbus_sendpacket(struct hv_device *device, const void *buffer,
+                                  u32 bufferlen, u64 requestid, u32 type,
+                                  u32 flags)
 {
-       return VmbusChannelSendPacket(device->context, Buffer, BufferLen,
-                                     RequestId, Type, Flags);
+       return vmbus_sendpacket(device->channel, buffer, bufferlen,
+                                     requestid, type, flags);
 }
 
-static int IVmbusChannelSendPacketPageBuffer(struct hv_device *device,
-                               struct hv_page_buffer PageBuffers[],
-                               u32 PageCount, void *Buffer,
-                               u32 BufferLen, u64 RequestId)
+static int ivmbus_sendpacket_pagebuffer(struct hv_device *device,
+                               struct hv_page_buffer pagebuffers[],
+                               u32 pagecount, void *buffer,
+                               u32 bufferlen, u64 requestid)
 {
-       return VmbusChannelSendPacketPageBuffer(device->context, PageBuffers,
-                                               PageCount, Buffer, BufferLen,
-                                               RequestId);
+       return vmbus_sendpacket_pagebuffer(device->channel, pagebuffers,
+                                               pagecount, buffer, bufferlen,
+                                               requestid);
 }
 
-static int IVmbusChannelSendPacketMultiPageBuffer(struct hv_device *device,
-                               struct hv_multipage_buffer *MultiPageBuffer,
-                               void *Buffer, u32 BufferLen, u64 RequestId)
+static int ivmbus_sendpacket_multipagebuffer(struct hv_device *device,
+                               struct hv_multipage_buffer *multi_pagebuffer,
+                               void *buffer, u32 bufferlen, u64 requestid)
 {
-       return VmbusChannelSendPacketMultiPageBuffer(device->context,
-                                                    MultiPageBuffer, Buffer,
-                                                    BufferLen, RequestId);
+       return vmbus_sendpacket_multipagebuffer(device->channel,
+                                                    multi_pagebuffer, buffer,
+                                                    bufferlen, requestid);
 }
 
-static int IVmbusChannelRecvPacket(struct hv_device *device, void *Buffer,
-                                  u32 BufferLen, u32 *BufferActualLen,
-                                  u64 *RequestId)
-{
-       return VmbusChannelRecvPacket(device->context, Buffer, BufferLen,
-                                     BufferActualLen, RequestId);
-}
-
-static int IVmbusChannelRecvPacketRaw(struct hv_device *device, void *Buffer,
-                                     u32 BufferLen, u32 *BufferActualLen,
-                                     u64 *RequestId)
-{
-       return VmbusChannelRecvPacketRaw(device->context, Buffer, BufferLen,
-                                        BufferActualLen, RequestId);
-}
-
-static int IVmbusChannelEstablishGpadl(struct hv_device *device, void *Buffer,
-                                      u32 BufferLen, u32 *GpadlHandle)
-{
-       return VmbusChannelEstablishGpadl(device->context, Buffer, BufferLen,
-                                         GpadlHandle);
-}
-
-static int IVmbusChannelTeardownGpadl(struct hv_device *device, u32 GpadlHandle)
-{
-       return VmbusChannelTeardownGpadl(device->context, GpadlHandle);
-
-}
-
-void GetChannelInterface(struct vmbus_channel_interface *iface)
-{
-       iface->Open = IVmbusChannelOpen;
-       iface->Close    = IVmbusChannelClose;
-       iface->SendPacket = IVmbusChannelSendPacket;
-       iface->SendPacketPageBuffer = IVmbusChannelSendPacketPageBuffer;
-       iface->SendPacketMultiPageBuffer =
-                                       IVmbusChannelSendPacketMultiPageBuffer;
-       iface->RecvPacket = IVmbusChannelRecvPacket;
-       iface->RecvPacketRaw    = IVmbusChannelRecvPacketRaw;
-       iface->EstablishGpadl = IVmbusChannelEstablishGpadl;
-       iface->TeardownGpadl = IVmbusChannelTeardownGpadl;
-       iface->GetInfo = GetChannelInfo;
-}
-
-void GetChannelInfo(struct hv_device *device, struct hv_device_info *info)
-{
-       struct vmbus_channel_debug_info debugInfo;
-
-       if (!device->context)
-               return;
-
-       VmbusChannelGetDebugInfo(device->context, &debugInfo);
-
-       info->ChannelId = debugInfo.RelId;
-       info->ChannelState = debugInfo.State;
-       memcpy(&info->ChannelType, &debugInfo.InterfaceType,
-              sizeof(struct hv_guid));
-       memcpy(&info->ChannelInstance, &debugInfo.InterfaceInstance,
-              sizeof(struct hv_guid));
-
-       info->MonitorId = debugInfo.MonitorId;
-
-       info->ServerMonitorPending = debugInfo.ServerMonitorPending;
-       info->ServerMonitorLatency = debugInfo.ServerMonitorLatency;
-       info->ServerMonitorConnectionId = debugInfo.ServerMonitorConnectionId;
-
-       info->ClientMonitorPending = debugInfo.ClientMonitorPending;
-       info->ClientMonitorLatency = debugInfo.ClientMonitorLatency;
-       info->ClientMonitorConnectionId = debugInfo.ClientMonitorConnectionId;
-
-       info->Inbound.InterruptMask = debugInfo.Inbound.CurrentInterruptMask;
-       info->Inbound.ReadIndex = debugInfo.Inbound.CurrentReadIndex;
-       info->Inbound.WriteIndex = debugInfo.Inbound.CurrentWriteIndex;
-       info->Inbound.BytesAvailToRead = debugInfo.Inbound.BytesAvailToRead;
-       info->Inbound.BytesAvailToWrite = debugInfo.Inbound.BytesAvailToWrite;
-
-       info->Outbound.InterruptMask = debugInfo.Outbound.CurrentInterruptMask;
-       info->Outbound.ReadIndex = debugInfo.Outbound.CurrentReadIndex;
-       info->Outbound.WriteIndex = debugInfo.Outbound.CurrentWriteIndex;
-       info->Outbound.BytesAvailToRead = debugInfo.Outbound.BytesAvailToRead;
-       info->Outbound.BytesAvailToWrite = debugInfo.Outbound.BytesAvailToWrite;
-}
+/* vmbus interface function pointer table */
+const struct vmbus_channel_interface vmbus_ops = {
+       .Open = ivmbus_open,
+       .Close = ivmbus_close,
+       .SendPacket = ivmbus_sendpacket,
+       .SendPacketPageBuffer = ivmbus_sendpacket_pagebuffer,
+       .SendPacketMultiPageBuffer = ivmbus_sendpacket_multipagebuffer,
+};