3 files changed, 2 insertions, 7 deletions

diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index 6e13c1c976f1..ffdbd30e3ba5 100644
--- a/drivers/staging/hv/vmbus.c
+++ b/drivers/staging/hv/vmbus.c
@@ -262,7 +262,6 @@ int VmbusInitialize(struct hv_driver *drv)
         driver->OnMsgDpc                = VmbusOnMsgDPC;
         driver->OnEventDpc              = VmbusOnEventDPC;
         driver->GetChannelOffers        = VmbusGetChannelOffers;
-        driver->GetChannelInfo          = get_channel_info;
 
         /* Hypervisor initialization...setup hypercall page..etc */
         ret = HvInit();
diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h
index 0f79216252de..fdd6c59a0efd 100644
--- a/drivers/staging/hv/vmbus_api.h
+++ b/drivers/staging/hv/vmbus_api.h
@@ -183,9 +183,6 @@ struct vmbus_driver {
         void (*OnMsgDpc)(struct hv_driver *driver);
         void (*OnEventDpc)(struct hv_driver *driver);
         void (*GetChannelOffers)(void);
-
-        void (*GetChannelInfo)(struct hv_device *dev,
-                               struct hv_device_info *devinfo);
 };
 
 int VmbusInitialize(struct hv_driver *drv);
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index ad298871d3f3..68d95eb7f929 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -32,6 +32,7 @@
 #include "osd.h"
 #include "logging.h"
 #include "vmbus.h"
+#include "channel_interface.h"
 
 
 /* FIXME! We need to do this dynamically for PIC and APIC system */
@@ -470,9 +471,7 @@ EXPORT_SYMBOL(vmbus_get_interface);
 static void vmbus_child_device_get_info(struct hv_device *device_obj,
                                         struct hv_device_info *device_info)
 {
-        struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
-
-        vmbus_drv_obj->GetChannelInfo(device_obj, device_info);
+        get_channel_info(device_obj, device_info);
 }
 
 /*