Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / hv / vmbus.c

diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index 007543bdb4100b31d8dba170217a5f46939ef491..ca1e18a620067869d9ca163a04e86e4d31923f4f 100644 (file)
--- a/drivers/staging/hv/vmbus.c
+++ b/drivers/staging/hv/vmbus.c
@@ -57,9 +57,7 @@ static struct hv_device *gDevice; /* vmbus root device */
  */
 static void VmbusGetChannelOffers(void)
 {
-       DPRINT_ENTER(VMBUS);
        VmbusChannelRequestOffers();
-       DPRINT_EXIT(VMBUS);
 }
 
 /*
@@ -120,8 +118,6 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
        u32 *irqvector = AdditionalInfo;
        int ret;
 
-       DPRINT_ENTER(VMBUS);
-
        gDevice = dev;
 
        memcpy(&gDevice->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid));
@@ -136,8 +132,6 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
        ret = VmbusConnect();
 
        /* VmbusSendEvent(device->localPortId+1); */
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 
@@ -148,12 +142,9 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
 {
        int ret = 0;
 
-       DPRINT_ENTER(VMBUS);
        VmbusChannelReleaseUnattachedChannels();
        VmbusDisconnect();
        on_each_cpu(HvSynicCleanup, NULL, 1);
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 
@@ -164,9 +155,7 @@ static void VmbusOnCleanup(struct hv_driver *drv)
 {
        /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */
 
-       DPRINT_ENTER(VMBUS);
        HvCleanup();
-       DPRINT_EXIT(VMBUS);
 }
 
 /*
@@ -239,8 +228,6 @@ static int VmbusOnISR(struct hv_driver *drv)
        page_addr = gHvContext.synICMessagePage[cpu];
        msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;
 
-       DPRINT_ENTER(VMBUS);
-
        /* Check if there are actual msgs to be process */
        if (msg->Header.MessageType != HvMessageTypeNone) {
                DPRINT_DBG(VMBUS, "received msg type %d size %d",
@@ -259,7 +246,6 @@ static int VmbusOnISR(struct hv_driver *drv)
                ret |= 0x2;
        }
 
-       DPRINT_EXIT(VMBUS);
        return ret;
 }
 
@@ -271,8 +257,6 @@ int VmbusInitialize(struct hv_driver *drv)
        struct vmbus_driver *driver = (struct vmbus_driver *)drv;
        int ret;
 
-       DPRINT_ENTER(VMBUS);
-
        DPRINT_INFO(VMBUS, "+++++++ HV Driver version = %s +++++++",
                    HV_DRV_VERSION);
        DPRINT_INFO(VMBUS, "+++++++ Vmbus supported version = %d +++++++",
@@ -305,7 +289,5 @@ int VmbusInitialize(struct hv_driver *drv)
                                ret);
        gDriver = drv;
 
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }