Staging: hv: remove GetChannelInfo from struct vmbus_driver

It was only set to one value, so just make the call to
get_channel_info() directly.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index 6e13c1c976f1d9ddcdd5d0becc877259a2811299..ffdbd30e3ba5a51a7e9837396fde6c006d845826 100644 (file)
--- 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 0f79216252debd1a8c17004f2bdfbff4d18b4130..fdd6c59a0efd6da3d76bdea43beb64dd505d9971 100644 (file)
--- 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 ad298871d3f333782d30eaaab7a2e413cfefb6d8..68d95eb7f929c3eaacca777953a83c7c39d3e1f8 100644 (file)
--- 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);
 }
 
 /*