From e779f9615fabc7bae979ca3add35d1f71035e3b2 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 15 Mar 2011 15:03:41 -0700
Subject: [PATCH] --- yaml --- r: 248911 b: refs/heads/master c:
 eb1bb259cf216be0cd924e76e2185c7fb2c7e8ee h: refs/heads/master i:   248909:
 dc864016c7081f1ffeda70875860bfb4c1f9bcb8   248907:
 b38de6159178147413d8cb4ad1689c8f05366f01   248903:
 3f7c0f44b31a20d454d3e395ce512ee3aedde13d   248895:
 a92d837385be670e31b2068d27b40a68e42df128 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/hv/vmbus_drv.c | 44 ++++++++++++++--------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index b816f4c3036c..92047def5373 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5dce3db89def8e35d30521e187a0e8127937dd0
+refs/heads/master: eb1bb259cf216be0cd924e76e2185c7fb2c7e8ee
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index 3feed10a19a6..671632c9a026 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -47,7 +47,6 @@ struct hv_bus {
 	struct tasklet_struct event_dpc;
 };
 
-static void vmbus_shutdown(struct device *device);
 
 static irqreturn_t vmbus_isr(int irq, void *dev_id);
 
@@ -276,6 +275,28 @@ static int vmbus_remove(struct device *child_device)
 	return 0;
 }
 
+
+/*
+ * vmbus_shutdown - Shutdown a vmbus device
+ */
+static void vmbus_shutdown(struct device *child_device)
+{
+	struct hv_driver *drv;
+
+
+	/* The device may not be attached yet */
+	if (!child_device->driver)
+		return;
+
+	drv = drv_to_hv_drv(child_device->driver);
+
+	/* Let the specific open-source driver handles the removal if it can */
+	if (drv->driver.shutdown)
+		drv->driver.shutdown(child_device);
+
+	return;
+}
+
 /* The one and only one */
 static struct hv_bus  hv_bus = {
 	.bus.name =		"vmbus",
@@ -804,27 +825,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj)
 		    &device_obj->device);
 }
 
-/*
- * vmbus_shutdown - Shutdown a vmbus device
- */
-static void vmbus_shutdown(struct device *child_device)
-{
-	struct hv_driver *drv;
-
-
-	/* The device may not be attached yet */
-	if (!child_device->driver)
-		return;
-
-	drv = drv_to_hv_drv(child_device->driver);
-
-	/* Let the specific open-source driver handles the removal if it can */
-	if (drv->driver.shutdown)
-		drv->driver.shutdown(child_device);
-
-	return;
-}
-
 
 /*
  * vmbus_device_release - Final callback release of the vmbus child device