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

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

diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index f047c5a7f64c1c35e7eed64b9818906e6f95885d..fece30c303a54aeae1a5b9c326f4a1f1fad3a957 100644 (file)
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -74,8 +74,6 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel)
 {
        struct hv_monitor_page *monitorPage;
 
-       DPRINT_ENTER(VMBUS);
-
        if (Channel->OfferMsg.MonitorAllocated) {
                /* Each u32 represents 32 channels */
                set_bit(Channel->OfferMsg.ChildRelId & 31,
@@ -92,8 +90,6 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel)
        } else {
                VmbusSetEvent(Channel->OfferMsg.ChildRelId);
        }
-
-       DPRINT_EXIT(VMBUS);
 }
 
 #if 0
@@ -101,8 +97,6 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
 {
        struct hv_monitor_page *monitorPage;
 
-       DPRINT_ENTER(VMBUS);
-
        if (Channel->OfferMsg.MonitorAllocated) {
                /* Each u32 represents 32 channels */
                clear_bit(Channel->OfferMsg.ChildRelId & 31,
@@ -117,8 +111,6 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
                          (unsigned long *)&monitorPage->TriggerGroup
                                        [Channel->MonitorGroup].Pending);
        }
-
-       DPRINT_EXIT(VMBUS);
 }
 
 #endif
@@ -180,8 +172,6 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize,
        unsigned long flags;
        int ret, err = 0;
 
-       DPRINT_ENTER(VMBUS);
-
        /* Aligned to page size */
        /* ASSERT(!(SendRingBufferSize & (PAGE_SIZE - 1))); */
        /* ASSERT(!(RecvRingBufferSize & (PAGE_SIZE - 1))); */
@@ -305,9 +295,6 @@ Cleanup:
 
        kfree(openInfo->WaitEvent);
        kfree(openInfo);
-
-       DPRINT_EXIT(VMBUS);
-
        return 0;
 
 errorout:
@@ -465,6 +452,8 @@ static int VmbusChannelCreateGpadlHeader(void *Kbuffer, u32 Size,
                          sizeof(struct vmbus_channel_gpadl_header) +
                          sizeof(struct gpa_range) + pageCount * sizeof(u64);
                msgHeader = kzalloc(msgSize, GFP_KERNEL);
+               if (msgHeader == NULL)
+                       goto nomem;
                msgHeader->MessageSize = msgSize;
 
                gpaHeader = (struct vmbus_channel_gpadl_header *)msgHeader->Msg;
@@ -509,8 +498,6 @@ int VmbusChannelEstablishGpadl(struct vmbus_channel *Channel, void *Kbuffer,
        unsigned long flags;
        int ret = 0;
 
-       DPRINT_ENTER(VMBUS);
-
        nextGpadlHandle = atomic_read(&gVmbusConnection.NextGpadlHandle);
        atomic_inc(&gVmbusConnection.NextGpadlHandle);
 
@@ -592,9 +579,6 @@ Cleanup:
 
        kfree(msgInfo->WaitEvent);
        kfree(msgInfo);
-
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 
@@ -608,8 +592,6 @@ int VmbusChannelTeardownGpadl(struct vmbus_channel *Channel, u32 GpadlHandle)
        unsigned long flags;
        int ret;
 
-       DPRINT_ENTER(VMBUS);
-
        /* ASSERT(GpadlHandle != 0); */
 
        info = kmalloc(sizeof(*info) +
@@ -650,9 +632,6 @@ int VmbusChannelTeardownGpadl(struct vmbus_channel *Channel, u32 GpadlHandle)
 
        kfree(info->WaitEvent);
        kfree(info);
-
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 
@@ -666,8 +645,6 @@ void VmbusChannelClose(struct vmbus_channel *Channel)
        unsigned long flags;
        int ret;
 
-       DPRINT_ENTER(VMBUS);
-
        /* Stop callback and cancel the timer asap */
        Channel->OnChannelCallback = NULL;
        del_timer_sync(&Channel->poll_timer);
@@ -720,8 +697,6 @@ void VmbusChannelClose(struct vmbus_channel *Channel)
 
                FreeVmbusChannel(Channel);
        }
-
-       DPRINT_EXIT(VMBUS);
 }
 
 /**
@@ -749,7 +724,6 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel, const void *Buffer,
        u64 alignedData = 0;
        int ret;
 
-       DPRINT_ENTER(VMBUS);
        DPRINT_DBG(VMBUS, "channel %p buffer %p len %d",
                   Channel, Buffer, BufferLen);
 
@@ -776,8 +750,6 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel, const void *Buffer,
        if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))
                VmbusChannelSetEvent(Channel);
 
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 EXPORT_SYMBOL(VmbusChannelSendPacket);
@@ -800,8 +772,6 @@ int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel,
        struct scatterlist bufferList[3];
        u64 alignedData = 0;
 
-       DPRINT_ENTER(VMBUS);
-
        if (PageCount > MAX_PAGE_BUFFER_COUNT)
                return -EINVAL;
 
@@ -844,8 +814,6 @@ int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel,
        if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))
                VmbusChannelSetEvent(Channel);
 
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 
@@ -867,8 +835,6 @@ int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel,
        u32 PfnCount = NUM_PAGES_SPANNED(MultiPageBuffer->Offset,
                                         MultiPageBuffer->Length);
 
-       DPRINT_ENTER(VMBUS);
-
        DumpVmbusChannel(Channel);
 
        DPRINT_DBG(VMBUS, "data buffer - offset %u len %u pfn count %u",
@@ -914,8 +880,6 @@ int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel,
        if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))
                VmbusChannelSetEvent(Channel);
 
-       DPRINT_EXIT(VMBUS);
-
        return ret;
 }
 
@@ -942,8 +906,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
        int ret;
        unsigned long flags;
 
-       DPRINT_ENTER(VMBUS);
-
        *BufferActualLen = 0;
        *RequestId = 0;
 
@@ -955,7 +917,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
                spin_unlock_irqrestore(&Channel->inbound_lock, flags);
 
                /* DPRINT_DBG(VMBUS, "nothing to read!!"); */
-               DPRINT_EXIT(VMBUS);
                return 0;
        }
 
@@ -977,8 +938,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
 
                DPRINT_ERR(VMBUS, "buffer too small - got %d needs %d",
                           BufferLen, userLen);
-               DPRINT_EXIT(VMBUS);
-
                return -1;
        }
 
@@ -990,8 +949,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
 
        spin_unlock_irqrestore(&Channel->inbound_lock, flags);
 
-       DPRINT_EXIT(VMBUS);
-
        return 0;
 }
 EXPORT_SYMBOL(VmbusChannelRecvPacket);
@@ -1009,8 +966,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
        int ret;
        unsigned long flags;
 
-       DPRINT_ENTER(VMBUS);
-
        *BufferActualLen = 0;
        *RequestId = 0;
 
@@ -1022,7 +977,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
                spin_unlock_irqrestore(&Channel->inbound_lock, flags);
 
                /* DPRINT_DBG(VMBUS, "nothing to read!!"); */
-               DPRINT_EXIT(VMBUS);
                return 0;
        }
 
@@ -1043,7 +997,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
 
                DPRINT_ERR(VMBUS, "buffer too small - needed %d bytes but "
                           "got space for only %d bytes", packetLen, BufferLen);
-               DPRINT_EXIT(VMBUS);
                return -2;
        }
 
@@ -1053,9 +1006,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
        ret = RingBufferRead(&Channel->Inbound, Buffer, packetLen, 0);
 
        spin_unlock_irqrestore(&Channel->inbound_lock, flags);
-
-       DPRINT_EXIT(VMBUS);
-
        return 0;
 }