From 850187e9c419f967c4770b9577a7832c045218ab Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2010 09:48:39 -0700 Subject: [PATCH] --- yaml --- r: 220432 b: refs/heads/master c: 5dd30f5170b60e7124eed4ae1b389f280fac8930 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/channel_interface.c | 9 --------- trunk/drivers/staging/hv/vmbus_api.h | 3 --- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 9f1c70a1b841..50422b6ba07e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b60d71e2b6d352bd781ee6ec5c141fc0cd2cd8f6 +refs/heads/master: 5dd30f5170b60e7124eed4ae1b389f280fac8930 diff --git a/trunk/drivers/staging/hv/channel_interface.c b/trunk/drivers/staging/hv/channel_interface.c index a288b70b13c0..b818bcf886aa 100644 --- a/trunk/drivers/staging/hv/channel_interface.c +++ b/trunk/drivers/staging/hv/channel_interface.c @@ -41,17 +41,8 @@ static void ivmbus_close(struct hv_device *device) vmbus_close(device->channel); } -static int ivmbus_sendpacket(struct hv_device *device, const void *buffer, - u32 bufferlen, u64 requestid, u32 type, - u32 flags) -{ - return vmbus_sendpacket(device->channel, buffer, bufferlen, - requestid, type, flags); -} - /* vmbus interface function pointer table */ const struct vmbus_channel_interface vmbus_ops = { .Open = ivmbus_open, .Close = ivmbus_close, - .SendPacket = ivmbus_sendpacket, }; diff --git a/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h index 9fe983043574..ec352c38aa5c 100644 --- a/trunk/drivers/staging/hv/vmbus_api.h +++ b/trunk/drivers/staging/hv/vmbus_api.h @@ -88,7 +88,6 @@ struct hv_device_info { * struct vmbus_channel_interface - Contains member functions for vmbus channel * @Open: Open the channel * @Close: Close the channel - * @SendPacket: Send a packet over the channel * * This structure contains function pointer to control vmbus channel * behavior. None of these functions is externally callable, but they @@ -101,8 +100,6 @@ struct vmbus_channel_interface { void (*ChannelCallback)(void *context), void *Context); void (*Close)(struct hv_device *device); - int (*SendPacket)(struct hv_device *Device, const void *Buffer, - u32 BufferLen, u64 RequestId, u32 Type, u32 Flags); }; extern const struct vmbus_channel_interface vmbus_ops;