Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220370
b: refs/heads/master
c: 53e4f1e
h: refs/heads/master
v: v3
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Oct 15, 2010
1 parent 9831bba commit 3402907
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9de050c420648ef500f18be5b22c35951acce622
refs/heads/master: 53e4f1e65636244a14d52dccf7a92e544a54bff1
40 changes: 20 additions & 20 deletions trunk/drivers/staging/hv/channel_interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "osd.h"
#include "vmbus_private.h"

static int IVmbusChannelOpen(struct hv_device *device, u32 sendbuffer_size,
static int ivmbus_open(struct hv_device *device, u32 sendbuffer_size,
u32 recv_ringbuffer_size, void *userdata,
u32 userdatalen,
void (*channel_callback)(void *context),
Expand All @@ -36,20 +36,20 @@ static int IVmbusChannelOpen(struct hv_device *device, u32 sendbuffer_size,
channel_callback, context);
}

static void IVmbusChannelClose(struct hv_device *device)
static void ivmbus_close(struct hv_device *device)
{
vmbus_close(device->context);
}

static int IVmbusChannelSendPacket(struct hv_device *device, const void *buffer,
static int ivmbus_sendpacket(struct hv_device *device, const void *buffer,
u32 bufferlen, u64 requestid, u32 type,
u32 flags)
{
return vmbus_sendpacket(device->context, buffer, bufferlen,
requestid, type, flags);
}

static int IVmbusChannelSendPacketPageBuffer(struct hv_device *device,
static int ivmbus_sendpacket_pagebuffer(struct hv_device *device,
struct hv_page_buffer pagebuffers[],
u32 pagecount, void *buffer,
u32 bufferlen, u64 requestid)
Expand All @@ -59,7 +59,7 @@ static int IVmbusChannelSendPacketPageBuffer(struct hv_device *device,
requestid);
}

static int IVmbusChannelSendPacketMultiPageBuffer(struct hv_device *device,
static int ivmbus_sendpacket_multipagebuffer(struct hv_device *device,
struct hv_multipage_buffer *multi_pagebuffer,
void *buffer, u32 bufferlen, u64 requestid)
{
Expand All @@ -68,38 +68,38 @@ static int IVmbusChannelSendPacketMultiPageBuffer(struct hv_device *device,
bufferlen, requestid);
}

static int IVmbusChannelRecvPacket(struct hv_device *device, void *buffer,
static int ivmbus_recvpacket(struct hv_device *device, void *buffer,
u32 bufferlen, u32 *buffer_actuallen,
u64 *requestid)
{
return vmbus_recvpacket(device->context, buffer, bufferlen,
buffer_actuallen, requestid);
}

static int IVmbusChannelRecvPacketRaw(struct hv_device *device, void *buffer,
static int ivmbus_recvpacket_raw(struct hv_device *device, void *buffer,
u32 bufferlen, u32 *buffer_actuallen,
u64 *requestid)
{
return vmbus_recvpacket_raw(device->context, buffer, bufferlen,
buffer_actuallen, requestid);
}

static int IVmbusChannelEstablishGpadl(struct hv_device *device, void *buffer,
static int ivmbus_establish_gpadl(struct hv_device *device, void *buffer,
u32 bufferlen, u32 *gpadl_handle)
{
return vmbus_establish_gpadl(device->context, buffer, bufferlen,
gpadl_handle);
}

static int IVmbusChannelTeardownGpadl(struct hv_device *device,
static int ivmbus_teardown_gpadl(struct hv_device *device,
u32 gpadl_handle)
{
return vmbus_teardown_gpadl(device->context, gpadl_handle);

}


void GetChannelInfo(struct hv_device *device, struct hv_device_info *info)
void get_channel_info(struct hv_device *device, struct hv_device_info *info)
{
struct vmbus_channel_debug_info debug_info;

Expand Down Expand Up @@ -142,14 +142,14 @@ void GetChannelInfo(struct hv_device *device, struct hv_device_info *info)

/* vmbus interface function pointer table */
const struct vmbus_channel_interface vmbus_ops = {
.Open = IVmbusChannelOpen,
.Close = IVmbusChannelClose,
.SendPacket = IVmbusChannelSendPacket,
.SendPacketPageBuffer = IVmbusChannelSendPacketPageBuffer,
.SendPacketMultiPageBuffer = IVmbusChannelSendPacketMultiPageBuffer,
.RecvPacket = IVmbusChannelRecvPacket,
.RecvPacketRaw = IVmbusChannelRecvPacketRaw,
.EstablishGpadl = IVmbusChannelEstablishGpadl,
.TeardownGpadl = IVmbusChannelTeardownGpadl,
.GetInfo = GetChannelInfo,
.Open = ivmbus_open,
.Close = ivmbus_close,
.SendPacket = ivmbus_sendpacket,
.SendPacketPageBuffer = ivmbus_sendpacket_pagebuffer,
.SendPacketMultiPageBuffer = ivmbus_sendpacket_multipagebuffer,
.RecvPacket = ivmbus_recvpacket,
.RecvPacketRaw = ivmbus_recvpacket_raw,
.EstablishGpadl = ivmbus_establish_gpadl,
.TeardownGpadl = ivmbus_teardown_gpadl,
.GetInfo = get_channel_info,
};
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/channel_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "vmbus_api.h"

void GetChannelInfo(struct hv_device *Device,
void get_channel_info(struct hv_device *Device,
struct hv_device_info *DeviceInfo);

#endif /* _CHANNEL_INTERFACE_H_ */
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/vmbus.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static void VmbusGetChannelOffers(void)
static void VmbusGetChannelInfo(struct hv_device *DeviceObject,
struct hv_device_info *DeviceInfo)
{
GetChannelInfo(DeviceObject, DeviceInfo);
get_channel_info(DeviceObject, DeviceInfo);
}

/*
Expand Down

0 comments on commit 3402907

Please sign in to comment.