From 0a437adc1342c4d397da67c3fc2a999e89d52b1d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 21 Oct 2010 08:50:16 -0700
Subject: [PATCH] --- yaml --- r: 220416 b: refs/heads/master c:
 d068cb4f6f469627af0a5bd45d3a21ed0df81368 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/hv/channel_interface.c | 8 --------
 trunk/drivers/staging/hv/vmbus_api.h         | 3 ---
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 105b2084d569..db9155654684 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81f162035745b59d0defd210751d52c20d4b6746
+refs/heads/master: d068cb4f6f469627af0a5bd45d3a21ed0df81368
diff --git a/trunk/drivers/staging/hv/channel_interface.c b/trunk/drivers/staging/hv/channel_interface.c
index c23a021f786f..5016668aea7b 100644
--- a/trunk/drivers/staging/hv/channel_interface.c
+++ b/trunk/drivers/staging/hv/channel_interface.c
@@ -84,13 +84,6 @@ static int ivmbus_recvpacket_raw(struct hv_device *device, void *buffer,
 					 buffer_actuallen, requestid);
 }
 
-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);
-}
-
 /* vmbus interface function pointer table */
 const struct vmbus_channel_interface vmbus_ops = {
 	.Open = ivmbus_open,
@@ -100,5 +93,4 @@ const struct vmbus_channel_interface vmbus_ops = {
 	.SendPacketMultiPageBuffer = ivmbus_sendpacket_multipagebuffer,
 	.RecvPacket = ivmbus_recvpacket,
 	.RecvPacketRaw	= ivmbus_recvpacket_raw,
-	.EstablishGpadl = ivmbus_establish_gpadl,
 };
diff --git a/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h
index bd68a07f36cd..c05201228ef7 100644
--- a/trunk/drivers/staging/hv/vmbus_api.h
+++ b/trunk/drivers/staging/hv/vmbus_api.h
@@ -93,7 +93,6 @@ struct hv_device_info {
  * @SendPacketMultiPageBuffer: Send a multiple page buffers
  * @RecvPacket:        Receive packet
  * @RecvPacketRaw:     Receive Raw packet
- * @EstablishGpadl:    Set up GPADL for ringbuffer
  *
  * This structure contains function pointer to control vmbus channel
  * behavior. None of these functions is externally callable, but they
@@ -121,8 +120,6 @@ struct vmbus_channel_interface {
 			  u32 *BufferActualLen, u64 *RequestId);
 	int (*RecvPacketRaw)(struct hv_device *dev, void *buf, u32 buflen,
 			     u32 *BufferActualLen, u64 *RequestId);
-	int (*EstablishGpadl)(struct hv_device *dev, void *buf, u32 buflen,
-			      u32 *GpadlHandle);
 };
 
 extern const struct vmbus_channel_interface vmbus_ops;