From bf6277a80e11edea467b8e4370e8f56d7d673066 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 20 Oct 2010 15:55:36 -0700
Subject: [PATCH] --- yaml --- r: 220406 b: refs/heads/master c:
 ee00966818584e8dbf7a5c7118c3b3cfebd6be14 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fe133bc45bfc..0030a7bfd929 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50fe56d24897838d5b65ee4d4baa6cad73de804b
+refs/heads/master: ee00966818584e8dbf7a5c7118c3b3cfebd6be14
diff --git a/trunk/drivers/staging/hv/vmbus.c b/trunk/drivers/staging/hv/vmbus.c
index b385e6f6346b..6e13c1c976f1 100644
--- a/trunk/drivers/staging/hv/vmbus.c
+++ b/trunk/drivers/staging/hv/vmbus.c
@@ -60,15 +60,6 @@ static void VmbusGetChannelOffers(void)
 	vmbus_request_offers();
 }
 
-/*
- * VmbusGetChannelInfo - Get the device info for the specified device object
- */
-static void VmbusGetChannelInfo(struct hv_device *DeviceObject,
-				struct hv_device_info *DeviceInfo)
-{
-	get_channel_info(DeviceObject, DeviceInfo);
-}
-
 /*
  * VmbusCreateChildDevice - Creates the child device on the bus that represents the channel offer
  */
@@ -271,7 +262,7 @@ int VmbusInitialize(struct hv_driver *drv)
 	driver->OnMsgDpc		= VmbusOnMsgDPC;
 	driver->OnEventDpc		= VmbusOnEventDPC;
 	driver->GetChannelOffers	= VmbusGetChannelOffers;
-	driver->GetChannelInfo		= VmbusGetChannelInfo;
+	driver->GetChannelInfo		= get_channel_info;
 
 	/* Hypervisor initialization...setup hypercall page..etc */
 	ret = HvInit();