Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[karo-tx-linux.git] / drivers / staging / hv / connection.c

diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index e8824dadffc31786f32ac5494ad1b32f46c911b4..1f4d6683aaa7e15bd716c25ac26c1eee0e30c092 100644 (file)
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -44,8 +44,6 @@ int VmbusConnect(void)
        struct vmbus_channel_initiate_contact *msg;
        unsigned long flags;
 
-       DPRINT_ENTER(VMBUS);
-
        /* Make sure we are not connecting or connected */
        if (gVmbusConnection.ConnectState != Disconnected)
                return -1;
@@ -155,8 +153,6 @@ int VmbusConnect(void)
 
        kfree(msgInfo->WaitEvent);
        kfree(msgInfo);
-       DPRINT_EXIT(VMBUS);
-
        return 0;
 
 Cleanup:
@@ -180,8 +176,6 @@ Cleanup:
                kfree(msgInfo);
        }
 
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 
@@ -193,8 +187,6 @@ int VmbusDisconnect(void)
        int ret = 0;
        struct vmbus_channel_message_header *msg;
 
-       DPRINT_ENTER(VMBUS);
-
        /* Make sure we are connected */
        if (gVmbusConnection.ConnectState != Connected)
                return -1;
@@ -221,7 +213,6 @@ int VmbusDisconnect(void)
 
 Cleanup:
        kfree(msg);
-       DPRINT_EXIT(VMBUS);
        return ret;
 }
 
@@ -285,8 +276,6 @@ void VmbusOnEvents(void)
        int relid;
        u32 *recvInterruptPage = gVmbusConnection.RecvInterruptPage;
 
-       DPRINT_ENTER(VMBUS);
-
        /* Check events */
        if (recvInterruptPage) {
                for (dword = 0; dword < maxdword; dword++) {
@@ -310,8 +299,6 @@ void VmbusOnEvents(void)
                        }
                 }
        }
-       DPRINT_EXIT(VMBUS);
-
        return;
 }
 
@@ -332,18 +319,10 @@ int VmbusPostMessage(void *buffer, size_t bufferLen)
  */
 int VmbusSetEvent(u32 childRelId)
 {
-       int ret = 0;
-
-       DPRINT_ENTER(VMBUS);
-
        /* Each u32 represents 32 channels */
        set_bit(childRelId & 31,
                (unsigned long *)gVmbusConnection.SendInterruptPage +
                (childRelId >> 5));
 
-       ret = HvSignalEvent();
-
-       DPRINT_EXIT(VMBUS);
-
-       return ret;
+       return HvSignalEvent();
 }