From e8f6a288f571943efac1458669e99df396c0ab2b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2010 08:42:55 -0700 Subject: [PATCH] --- yaml --- r: 220413 b: refs/heads/master c: a78770572074c63fd34dd64fbfd777675bef23db h: refs/heads/master i: 220411: bc0ed962dc0cd041965d77f9df4cce0ba7c26eff v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/channel_interface.c | 8 -------- trunk/drivers/staging/hv/vmbus_api.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 7b218c807a80..11701ed15ca2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 314bf1d12a5f7597b316552b008051c26627eabb +refs/heads/master: a78770572074c63fd34dd64fbfd777675bef23db diff --git a/trunk/drivers/staging/hv/channel_interface.c b/trunk/drivers/staging/hv/channel_interface.c index 24a8951b9a15..c23a021f786f 100644 --- a/trunk/drivers/staging/hv/channel_interface.c +++ b/trunk/drivers/staging/hv/channel_interface.c @@ -91,13 +91,6 @@ static int ivmbus_establish_gpadl(struct hv_device *device, void *buffer, gpadl_handle); } -static int ivmbus_teardown_gpadl(struct hv_device *device, - u32 gpadl_handle) -{ - return vmbus_teardown_gpadl(device->context, gpadl_handle); - -} - /* vmbus interface function pointer table */ const struct vmbus_channel_interface vmbus_ops = { .Open = ivmbus_open, @@ -108,5 +101,4 @@ const struct vmbus_channel_interface vmbus_ops = { .RecvPacket = ivmbus_recvpacket, .RecvPacketRaw = ivmbus_recvpacket_raw, .EstablishGpadl = ivmbus_establish_gpadl, - .TeardownGpadl = ivmbus_teardown_gpadl, }; diff --git a/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h index fdd6c59a0efd..bd68a07f36cd 100644 --- a/trunk/drivers/staging/hv/vmbus_api.h +++ b/trunk/drivers/staging/hv/vmbus_api.h @@ -94,7 +94,6 @@ struct hv_device_info { * @RecvPacket: Receive packet * @RecvPacketRaw: Receive Raw packet * @EstablishGpadl: Set up GPADL for ringbuffer - * @TeardownGpadl: Teardown GPADL for ringbuffer * * This structure contains function pointer to control vmbus channel * behavior. None of these functions is externally callable, but they @@ -124,7 +123,6 @@ struct vmbus_channel_interface { u32 *BufferActualLen, u64 *RequestId); int (*EstablishGpadl)(struct hv_device *dev, void *buf, u32 buflen, u32 *GpadlHandle); - int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle); }; extern const struct vmbus_channel_interface vmbus_ops;