Staging: hv: remove GetChannelInfo from struct vmbus_driver

[net-next-2.6.git] / drivers / staging / hv / vmbus.c

diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index ea2698c1607d2612c7d3bb975c496792a852d102..ffdbd30e3ba5a51a7e9837396fde6c006d845826 100644 (file)
--- a/drivers/staging/hv/vmbus.c
+++ b/drivers/staging/hv/vmbus.c
@@ -57,16 +57,7 @@ static struct hv_device *gDevice; /* vmbus root device */
  */
 static void VmbusGetChannelOffers(void)
 {
-       VmbusChannelRequestOffers();
-}
-
-/*
- * VmbusGetChannelInfo - Get the device info for the specified device object
- */
-static void VmbusGetChannelInfo(struct hv_device *DeviceObject,
-                               struct hv_device_info *DeviceInfo)
-{
-       GetChannelInfo(DeviceObject, DeviceInfo);
+       vmbus_request_offers();
 }
 
 /*
@@ -134,7 +125,7 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
 {
        int ret = 0;
 
-       VmbusChannelReleaseUnattachedChannels();
+       vmbus_release_unattached_channels();
        VmbusDisconnect();
        on_each_cpu(HvSynicCleanup, NULL, 1);
        return ret;
@@ -171,7 +162,7 @@ static void VmbusOnMsgDPC(struct hv_driver *drv)
                                continue;
 
                        osd_schedule_callback(gVmbusConnection.WorkQueue,
-                                             VmbusOnChannelMessage,
+                                             vmbus_onmessage,
                                              (void *)copied);
                }
 
@@ -271,7 +262,6 @@ int VmbusInitialize(struct hv_driver *drv)
        driver->OnMsgDpc                = VmbusOnMsgDPC;
        driver->OnEventDpc              = VmbusOnEventDPC;
        driver->GetChannelOffers        = VmbusGetChannelOffers;
-       driver->GetChannelInfo          = VmbusGetChannelInfo;
 
        /* Hypervisor initialization...setup hypercall page..etc */
        ret = HvInit();