From 2cb01f37d3e6bda7686384ccc902bcc8fce84d04 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 6 Jun 2011 15:50:01 -0700
Subject: [PATCH] --- yaml --- r: 259469 b: refs/heads/master c:
 c0e2490fd42b0676e1ecb2d4ba7a6d0ec21d557b h: refs/heads/master i:   259467:
 9f6171640a9fc2b1daf79f51c0aa5dd75d993e48 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/hv/connection.c   | 38 -------------------------
 trunk/drivers/staging/hv/hyperv_vmbus.h |  2 --
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/[refs] b/[refs]
index e014dbafefab..b53fb204975f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db545da77b197f580fe73a0a21a0982dd2def8e3
+refs/heads/master: c0e2490fd42b0676e1ecb2d4ba7a6d0ec21d557b
diff --git a/trunk/drivers/staging/hv/connection.c b/trunk/drivers/staging/hv/connection.c
index fc93bdfdd0bd..7d7f1d5d5a3d 100644
--- a/trunk/drivers/staging/hv/connection.c
+++ b/trunk/drivers/staging/hv/connection.c
@@ -185,44 +185,6 @@ int vmbus_connect(void)
 	return ret;
 }
 
-/*
- * vmbus_disconnect -
- * Sends a disconnect request on the partition service connection
- */
-int vmbus_disconnect(void)
-{
-	int ret = 0;
-	struct vmbus_channel_message_header *msg;
-
-	/* Make sure we are connected */
-	if (vmbus_connection.conn_state != CONNECTED)
-		return -1;
-
-	msg = kzalloc(sizeof(struct vmbus_channel_message_header), GFP_KERNEL);
-	if (!msg)
-		return -ENOMEM;
-
-	msg->msgtype = CHANNELMSG_UNLOAD;
-
-	ret = vmbus_post_msg(msg,
-			       sizeof(struct vmbus_channel_message_header));
-	if (ret != 0)
-		goto cleanup;
-
-	free_pages((unsigned long)vmbus_connection.int_page, 0);
-	free_pages((unsigned long)vmbus_connection.monitor_pages, 1);
-
-	/* TODO: iterate thru the msg list and free up */
-	destroy_workqueue(vmbus_connection.work_queue);
-
-	vmbus_connection.conn_state = DISCONNECTED;
-
-	pr_info("hv_vmbus disconnected\n");
-
-cleanup:
-	kfree(msg);
-	return ret;
-}
 
 /*
  * relid2channel - Get the channel object given its
diff --git a/trunk/drivers/staging/hv/hyperv_vmbus.h b/trunk/drivers/staging/hv/hyperv_vmbus.h
index bf30a425b643..349ad80ce328 100644
--- a/trunk/drivers/staging/hv/hyperv_vmbus.h
+++ b/trunk/drivers/staging/hv/hyperv_vmbus.h
@@ -619,8 +619,6 @@ struct vmbus_channel *relid2channel(u32 relid);
 
 int vmbus_connect(void);
 
-int vmbus_disconnect(void);
-
 int vmbus_post_msg(void *buffer, size_t buflen);
 
 int vmbus_set_event(u32 child_relid);