From 3925749bed3ecc87efa8b5f06ea2f5df7abe7d5f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2010 09:11:00 -0700 Subject: [PATCH] --- yaml --- r: 220421 b: refs/heads/master c: 559f816e13b1e40e274d1aeeaaa7468986f997c0 h: refs/heads/master i: 220419: a00fe8e94701863a21a825c146a8e644c89011cf 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 4062ad6dcc0a..89d97ee46bf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f630068e8ccba24d728f196cb3ddc120ebee38e +refs/heads/master: 559f816e13b1e40e274d1aeeaaa7468986f997c0 diff --git a/trunk/drivers/staging/hv/channel_interface.c b/trunk/drivers/staging/hv/channel_interface.c index 35b700f8612b..e504e9878421 100644 --- a/trunk/drivers/staging/hv/channel_interface.c +++ b/trunk/drivers/staging/hv/channel_interface.c @@ -76,14 +76,6 @@ static int ivmbus_recvpacket(struct hv_device *device, void *buffer, buffer_actuallen, requestid); } -static int ivmbus_recvpacket_raw(struct hv_device *device, void *buffer, - u32 bufferlen, u32 *buffer_actuallen, - u64 *requestid) -{ - return vmbus_recvpacket_raw(device->channel, buffer, bufferlen, - buffer_actuallen, requestid); -} - /* vmbus interface function pointer table */ const struct vmbus_channel_interface vmbus_ops = { .Open = ivmbus_open, @@ -92,5 +84,4 @@ const struct vmbus_channel_interface vmbus_ops = { .SendPacketPageBuffer = ivmbus_sendpacket_pagebuffer, .SendPacketMultiPageBuffer = ivmbus_sendpacket_multipagebuffer, .RecvPacket = ivmbus_recvpacket, - .RecvPacketRaw = ivmbus_recvpacket_raw, }; diff --git a/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h index 17e3c9addc67..b3f2132cf431 100644 --- a/trunk/drivers/staging/hv/vmbus_api.h +++ b/trunk/drivers/staging/hv/vmbus_api.h @@ -92,7 +92,6 @@ struct hv_device_info { * @SendPacketPageBuffer: Send a single page buffer over the channel * @SendPacketMultiPageBuffer: Send a multiple page buffers * @RecvPacket: Receive packet - * @RecvPacketRaw: Receive Raw packet * * This structure contains function pointer to control vmbus channel * behavior. None of these functions is externally callable, but they @@ -118,8 +117,6 @@ struct vmbus_channel_interface { u64 RequestId); int (*RecvPacket)(struct hv_device *dev, void *buf, u32 buflen, u32 *BufferActualLen, u64 *RequestId); - int (*RecvPacketRaw)(struct hv_device *dev, void *buf, u32 buflen, - u32 *BufferActualLen, u64 *RequestId); }; extern const struct vmbus_channel_interface vmbus_ops;