Staging: hv: remove DPRINT_ENTER macro

We have ftrace to look at function traces if its really
needed.  Don't roll custom macros for this.

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

16 files changed, 0 insertions, 262 deletions

diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c
index 0daebc472e6..3aeeda2cbe7 100644
--- a/drivers/staging/hv/blkvsc.c
+++ b/drivers/staging/hv/blkvsc.c
@@ -40,8 +40,6 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
         struct storvsc_device_info *deviceInfo;
         int ret = 0;
 
-        DPRINT_ENTER(BLKVSC);
-
         deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
 
         ret = StorVscOnDeviceAdd(Device, AdditionalInfo);
@@ -73,8 +71,6 @@ int BlkVscInitialize(struct hv_driver *Driver)
         struct storvsc_driver_object *storDriver;
         int ret = 0;
 
-        DPRINT_ENTER(BLKVSC);
-
         storDriver = (struct storvsc_driver_object *)Driver;
 
         /* Make sure we are at least 2 pages since 1 page is used for control */
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 61bd0be5fb1..f134021d48d 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -175,8 +175,6 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
         struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;
         int ret;
 
-        DPRINT_ENTER(BLKVSC_DRV);
-
         vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);
 
         storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;
@@ -214,8 +212,6 @@ static void blkvsc_drv_exit(void)
         struct device *current_dev;
         int ret;
 
-        DPRINT_ENTER(BLKVSC_DRV);
-
         while (1) {
                 current_dev = NULL;
 
@@ -268,8 +264,6 @@ static int blkvsc_probe(struct device *device)
         static int ide0_registered;
         static int ide1_registered;
 
-        DPRINT_ENTER(BLKVSC_DRV);
-
         DPRINT_DBG(BLKVSC_DRV, "blkvsc_probe - enter");
 
         if (!storvsc_drv_obj->Base.OnDeviceAdd) {
@@ -751,8 +745,6 @@ static int blkvsc_remove(struct device *device)
         unsigned long flags;
         int ret;
 
-        DPRINT_ENTER(BLKVSC_DRV);
-
         DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");
 
         if (!storvsc_drv_obj->Base.OnDeviceRemove) {
@@ -1492,8 +1484,6 @@ static int __init blkvsc_init(void)
 
         BUILD_BUG_ON(sizeof(sector_t) != 8);
 
-        DPRINT_ENTER(BLKVSC_DRV);
-
         DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing....");
 
         ret = blkvsc_drv_init(BlkVscInitialize);
@@ -1505,9 +1495,7 @@ static int __init blkvsc_init(void)
 
 static void __exit blkvsc_exit(void)
 {
-        DPRINT_ENTER(BLKVSC_DRV);
         blkvsc_drv_exit();
-        DPRINT_ENTER(BLKVSC_DRV);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index 78d1aa5f7f9..de5b1f2b3a8 100644
--- 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,
@@ -101,8 +99,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,
@@ -180,8 +176,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))); */
@@ -511,8 +505,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);
 
@@ -610,8 +602,6 @@ int VmbusChannelTeardownGpadl(struct vmbus_channel *Channel, u32 GpadlHandle)
         unsigned long flags;
         int ret;
 
-        DPRINT_ENTER(VMBUS);
-
         /* ASSERT(GpadlHandle != 0); */
 
         info = kmalloc(sizeof(*info) +
@@ -668,8 +658,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);
@@ -751,7 +739,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);
 
@@ -802,8 +789,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;
 
@@ -869,8 +854,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",
@@ -944,8 +927,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
         int ret;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         *BufferActualLen = 0;
         *RequestId = 0;
 
@@ -1011,8 +992,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
         int ret;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         *BufferActualLen = 0;
         *RequestId = 0;
 
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index 3f53b4d1e4c..9c86efc78eb 100644
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -266,8 +266,6 @@ static inline void ReleaseVmbusChannel(void *context)
 {
         struct vmbus_channel *channel = context;
 
-        DPRINT_ENTER(VMBUS);
-
         DPRINT_DBG(VMBUS, "releasing channel (%p)", channel);
         destroy_workqueue(channel->ControlWQ);
         DPRINT_DBG(VMBUS, "channel released (%p)", channel);
@@ -306,8 +304,6 @@ static void VmbusChannelProcessOffer(void *context)
         int cnt;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         /* Make sure this is a new offer */
         spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
 
@@ -401,7 +397,6 @@ static void VmbusChannelProcessRescindOffer(void *context)
 {
         struct vmbus_channel *channel = context;
 
-        DPRINT_ENTER(VMBUS);
         VmbusChildDeviceRemove(channel->DeviceObject);
         DPRINT_EXIT(VMBUS);
 }
@@ -422,8 +417,6 @@ static void VmbusChannelOnOffer(struct vmbus_channel_message_header *hdr)
         int i;
         int fSupported = 0;
 
-        DPRINT_ENTER(VMBUS);
-
         offer = (struct vmbus_channel_offer_channel *)hdr;
         for (i = 0; i < MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++) {
                 if (memcmp(&offer->Offer.InterfaceType,
@@ -499,8 +492,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr)
         struct vmbus_channel_rescind_offer *rescind;
         struct vmbus_channel *channel;
 
-        DPRINT_ENTER(VMBUS);
-
         rescind = (struct vmbus_channel_rescind_offer *)hdr;
         channel = GetChannelFromRelId(rescind->ChildRelId);
         if (channel == NULL) {
@@ -524,7 +515,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr)
 static void VmbusChannelOnOffersDelivered(
                         struct vmbus_channel_message_header *hdr)
 {
-        DPRINT_ENTER(VMBUS);
         DPRINT_EXIT(VMBUS);
 }
 
@@ -544,8 +534,6 @@ static void VmbusChannelOnOpenResult(struct vmbus_channel_message_header *hdr)
         struct vmbus_channel_open_channel *openMsg;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         result = (struct vmbus_channel_open_result *)hdr;
         DPRINT_DBG(VMBUS, "vmbus open result - %d", result->Status);
 
@@ -592,8 +580,6 @@ static void VmbusChannelOnGpadlCreated(struct vmbus_channel_message_header *hdr)
         struct vmbus_channel_gpadl_header *gpadlHeader;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         gpadlCreated = (struct vmbus_channel_gpadl_created *)hdr;
         DPRINT_DBG(VMBUS, "vmbus gpadl created result - %d",
                    gpadlCreated->CreationStatus);
@@ -645,8 +631,6 @@ static void VmbusChannelOnGpadlTorndown(
         struct vmbus_channel_gpadl_teardown *gpadlTeardown;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         gpadlTorndown = (struct vmbus_channel_gpadl_torndown *)hdr;
 
         /*
@@ -693,8 +677,6 @@ static void VmbusChannelOnVersionResponse(
         struct vmbus_channel_version_response *versionResponse;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         versionResponse = (struct vmbus_channel_version_response *)hdr;
         spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
 
@@ -750,8 +732,6 @@ void VmbusOnChannelMessage(void *Context)
         struct vmbus_channel_message_header *hdr;
         int size;
 
-        DPRINT_ENTER(VMBUS);
-
         hdr = (struct vmbus_channel_message_header *)msg->u.Payload;
         size = msg->Header.PayloadSize;
 
@@ -787,8 +767,6 @@ int VmbusChannelRequestOffers(void)
         struct vmbus_channel_msginfo *msgInfo;
         int ret;
 
-        DPRINT_ENTER(VMBUS);
-
         msgInfo = kmalloc(sizeof(*msgInfo) +
                           sizeof(struct vmbus_channel_message_header),
                           GFP_KERNEL);
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index e8824dadffc..b8dd8f9206b 100644
--- 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;
@@ -193,8 +191,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;
@@ -285,8 +281,6 @@ void VmbusOnEvents(void)
         int relid;
         u32 *recvInterruptPage = gVmbusConnection.RecvInterruptPage;
 
-        DPRINT_ENTER(VMBUS);
-
         /* Check events */
         if (recvInterruptPage) {
                 for (dword = 0; dword < maxdword; dword++) {
@@ -334,8 +328,6 @@ int VmbusSetEvent(u32 childRelId)
 {
         int ret = 0;
 
-        DPRINT_ENTER(VMBUS);
-
         /* Each u32 represents 32 channels */
         set_bit(childRelId & 31,
                 (unsigned long *)gVmbusConnection.SendInterruptPage +
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index 6c77e64027f..6aa3697a07d 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -192,8 +192,6 @@ int HvInit(void)
         union hv_x64_msr_hypercall_contents hypercallMsr;
         void *virtAddr = NULL;
 
-        DPRINT_ENTER(VMBUS);
-
         memset(gHvContext.synICEventPage, 0, sizeof(void *) * MAX_NUM_CPUS);
         memset(gHvContext.synICMessagePage, 0, sizeof(void *) * MAX_NUM_CPUS);
 
@@ -303,8 +301,6 @@ void HvCleanup(void)
 {
         union hv_x64_msr_hypercall_contents hypercallMsr;
 
-        DPRINT_ENTER(VMBUS);
-
         kfree(gHvContext.SignalEventBuffer);
         gHvContext.SignalEventBuffer = NULL;
         gHvContext.SignalEventParam = NULL;
@@ -392,8 +388,6 @@ void HvSynicInit(void *irqarg)
         u32 irqVector = *((u32 *)(irqarg));
         int cpu = smp_processor_id();
 
-        DPRINT_ENTER(VMBUS);
-
         if (!gHvContext.HypercallPage) {
                 DPRINT_EXIT(VMBUS);
                 return;
@@ -490,8 +484,6 @@ void HvSynicCleanup(void *arg)
         union hv_synic_siefp siefp;
         int cpu = smp_processor_id();
 
-        DPRINT_ENTER(VMBUS);
-
         if (!gHvContext.SynICInitialized) {
                 DPRINT_EXIT(VMBUS);
                 return;
diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c
index 8a49aafea37..08cde24de2a 100644
--- a/drivers/staging/hv/hv_utils.c
+++ b/drivers/staging/hv/hv_utils.c
@@ -50,8 +50,6 @@ static void shutdown_onchannelcallback(void *context)
         struct icmsg_hdr *icmsghdrp;
         struct icmsg_negotiate *negop = NULL;
 
-        DPRINT_ENTER(VMBUS);
-
         buflen = PAGE_SIZE;
         buf = kmalloc(buflen, GFP_ATOMIC);
 
@@ -158,8 +156,6 @@ static void timesync_onchannelcallback(void *context)
         struct icmsg_hdr *icmsghdrp;
         struct ictimesync_data *timedatap;
 
-        DPRINT_ENTER(VMBUS);
-
         buflen = PAGE_SIZE;
         buf = kmalloc(buflen, GFP_ATOMIC);
 
@@ -208,8 +204,6 @@ static void heartbeat_onchannelcallback(void *context)
         struct icmsg_hdr *icmsghdrp;
         struct heartbeat_msg_data *heartbeat_msg;
 
-        DPRINT_ENTER(VMBUS);
-
         buflen = PAGE_SIZE;
         buf = kmalloc(buflen, GFP_ATOMIC);
 
diff --git a/drivers/staging/hv/logging.h b/drivers/staging/hv/logging.h
index ad4cfcfb7b1..090cda7d027 100644
--- a/drivers/staging/hv/logging.h
+++ b/drivers/staging/hv/logging.h
@@ -93,19 +93,12 @@ extern unsigned int vmbus_loglevel;
         } while (0)
 
 #ifdef DEBUG
-#define DPRINT_ENTER(mod) do {\
-        if ((mod & (HIWORD(vmbus_loglevel))) && \
-            (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel)))    \
-                printk(KERN_DEBUG "["#mod"]: %s() enter\n", __func__);\
-        } while (0)
-
 #define DPRINT_EXIT(mod) do {\
         if ((mod & (HIWORD(vmbus_loglevel))) && \
             (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel)))    \
                 printk(KERN_DEBUG "["#mod"]: %s() exit\n", __func__);\
         } while (0)
 #else
-#define DPRINT_ENTER(mod)
 #define DPRINT_EXIT(mod)
 #endif
 
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index ba15059c45b..3f79f04a206 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -174,8 +174,6 @@ int NetVscInitialize(struct hv_driver *drv)
 {
         struct netvsc_driver *driver = (struct netvsc_driver *)drv;
 
-        DPRINT_ENTER(NETVSC);
-
         DPRINT_DBG(NETVSC, "sizeof(struct hv_netvsc_packet)=%zd, "
                    "sizeof(struct nvsp_message)=%zd, "
                    "sizeof(struct vmtransfer_page_packet_header)=%zd",
@@ -214,8 +212,6 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
         struct netvsc_device *netDevice;
         struct nvsp_message *initPacket;
 
-        DPRINT_ENTER(NETVSC);
-
         netDevice = GetOutboundNetDevice(Device);
         if (!netDevice) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
@@ -345,8 +341,6 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
         struct netvsc_device *netDevice;
         struct nvsp_message *initPacket;
 
-        DPRINT_ENTER(NETVSC);
-
         netDevice = GetOutboundNetDevice(Device);
         if (!netDevice) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
@@ -443,8 +437,6 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
         struct nvsp_message *revokePacket;
         int ret = 0;
 
-        DPRINT_ENTER(NETVSC);
-
         /*
          * If we got a section count, it means we received a
          * SendReceiveBufferComplete msg (ie sent
@@ -523,8 +515,6 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
         struct nvsp_message *revokePacket;
         int ret = 0;
 
-        DPRINT_ENTER(NETVSC);
-
         /*
          * If we got a section count, it means we received a
          *  SendReceiveBufferComplete msg (ie sent
@@ -600,8 +590,6 @@ static int NetVscConnectToVsp(struct hv_device *Device)
         struct nvsp_message *initPacket;
         int ndisVersion;
 
-        DPRINT_ENTER(NETVSC);
-
         netDevice = GetOutboundNetDevice(Device);
         if (!netDevice) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
@@ -702,8 +690,6 @@ Cleanup:
 
 static void NetVscDisconnectFromVsp(struct netvsc_device *NetDevice)
 {
-        DPRINT_ENTER(NETVSC);
-
         NetVscDestroyReceiveBuffer(NetDevice);
         NetVscDestroySendBuffer(NetDevice);
 
@@ -722,8 +708,6 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
         struct netvsc_driver *netDriver =
                                 (struct netvsc_driver *)Device->Driver;
 
-        DPRINT_ENTER(NETVSC);
-
         netDevice = AllocNetDevice(Device);
         if (!netDevice) {
                 ret = -1;
@@ -824,8 +808,6 @@ static int NetVscOnDeviceRemove(struct hv_device *Device)
         struct netvsc_device *netDevice;
         struct hv_netvsc_packet *netvscPacket, *pos;
 
-        DPRINT_ENTER(NETVSC);
-
         DPRINT_INFO(NETVSC, "Disabling outbound traffic on net device (%p)...",
                     Device->Extension);
 
@@ -878,7 +860,6 @@ static int NetVscOnDeviceRemove(struct hv_device *Device)
  */
 static void NetVscOnCleanup(struct hv_driver *drv)
 {
-        DPRINT_ENTER(NETVSC);
         DPRINT_EXIT(NETVSC);
 }
 
@@ -889,8 +870,6 @@ static void NetVscOnSendCompletion(struct hv_device *Device,
         struct nvsp_message *nvspPacket;
         struct hv_netvsc_packet *nvscPacket;
 
-        DPRINT_ENTER(NETVSC);
-
         netDevice = GetInboundNetDevice(Device);
         if (!netDevice) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
@@ -940,8 +919,6 @@ static int NetVscOnSend(struct hv_device *Device,
 
         struct nvsp_message sendMessage;
 
-        DPRINT_ENTER(NETVSC);
-
         netDevice = GetOutboundNetDevice(Device);
         if (!netDevice) {
                 DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
@@ -1007,8 +984,6 @@ static void NetVscOnReceive(struct hv_device *Device,
         unsigned long flags;
         LIST_HEAD(listHead);
 
-        DPRINT_ENTER(NETVSC);
-
         netDevice = GetInboundNetDevice(Device);
         if (!netDevice) {
                 DPRINT_ERR(NETVSC, "unable to get net device..."
@@ -1248,8 +1223,6 @@ static void NetVscOnReceiveCompletion(void *Context)
         bool fSendReceiveComp = false;
         unsigned long flags;
 
-        DPRINT_ENTER(NETVSC);
-
         /* ASSERT(packet->XferPagePacket); */
 
         /*
@@ -1307,9 +1280,6 @@ static void NetVscOnChannelCallback(void *Context)
         unsigned char *buffer;
         int bufferlen = NETVSC_PACKET_SIZE;
 
-
-        DPRINT_ENTER(NETVSC);
-
         /* ASSERT(device); */
 
         packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 55b993298ff..c73fe95ad48 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -76,8 +76,6 @@ static int netvsc_open(struct net_device *net)
         struct hv_device *device_obj = &net_device_ctx->device_ctx->device_obj;
         int ret = 0;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         if (netif_carrier_ok(net)) {
                 /* Open up the device */
                 ret = RndisFilterOnOpen(device_obj);
@@ -102,8 +100,6 @@ static int netvsc_close(struct net_device *net)
         struct hv_device *device_obj = &net_device_ctx->device_ctx->device_obj;
         int ret;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         netif_stop_queue(net);
 
         ret = RndisFilterOnClose(device_obj);
@@ -121,8 +117,6 @@ static void netvsc_xmit_completion(void *context)
         struct sk_buff *skb = (struct sk_buff *)
                 (unsigned long)packet->Completion.Send.SendCompletionTid;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         kfree(packet);
 
         if (skb) {
@@ -151,8 +145,6 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
         int ret;
         unsigned int i, num_pages;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         DPRINT_DBG(NETVSC_DRV, "xmit packet - len %d data_len %d",
                    skb->len, skb->data_len);
 
@@ -238,8 +230,6 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
         struct vm_device *device_ctx = to_vm_device(device_obj);
         struct net_device *net = dev_get_drvdata(&device_ctx->device);
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         if (!net) {
                 DPRINT_ERR(NETVSC_DRV, "got link status but net device "
                                 "not initialized yet");
@@ -270,8 +260,6 @@ static int netvsc_recv_callback(struct hv_device *device_obj,
         int i;
         unsigned long flags;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         if (!net) {
                 DPRINT_ERR(NETVSC_DRV, "got receive callback but net device "
                                 "not initialized yet");
@@ -364,8 +352,6 @@ static int netvsc_probe(struct device *device)
         struct netvsc_device_info device_info;
         int ret;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         if (!net_drv_obj->Base.OnDeviceAdd)
                 return -1;
 
@@ -438,8 +424,6 @@ static int netvsc_remove(struct device *device)
         struct hv_device *device_obj = &device_ctx->device_obj;
         int ret;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         if (net == NULL) {
                 DPRINT_INFO(NETVSC, "no net device to remove");
                 DPRINT_EXIT(NETVSC_DRV);
@@ -488,8 +472,6 @@ static void netvsc_drv_exit(void)
         struct device *current_dev;
         int ret;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         while (1) {
                 current_dev = NULL;
 
@@ -526,8 +508,6 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
         struct driver_context *drv_ctx = &g_netvsc_drv.drv_ctx;
         int ret;
 
-        DPRINT_ENTER(NETVSC_DRV);
-
         vmbus_get_interface(&net_drv_obj->Base.VmbusChannelInterface);
 
         net_drv_obj->RingBufferSize = ring_size * PAGE_SIZE;
@@ -570,7 +550,6 @@ static int __init netvsc_init(void)
 {
         int ret;
 
-        DPRINT_ENTER(NETVSC_DRV);
         DPRINT_INFO(NETVSC_DRV, "Netvsc initializing....");
 
         if (!dmi_check_system(hv_netvsc_dmi_table))
@@ -585,7 +564,6 @@ static int __init netvsc_init(void)
 
 static void __exit netvsc_exit(void)
 {
-        DPRINT_ENTER(NETVSC_DRV);
         netvsc_drv_exit();
         DPRINT_EXIT(NETVSC_DRV);
 }
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index ae2a10e24d9..bac8056fab2 100644
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -352,8 +352,6 @@ int RingBufferWrite(RING_BUFFER_INFO *OutRingInfo,
         u64 prevIndices = 0;
         unsigned long flags;
 
-        DPRINT_ENTER(VMBUS);
-
         for_each_sg(sglist, sg, sgcount, i)
         {
                 totalBytesToWrite += sg->length;
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index 5edf0853c6a..6640682d36b 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -244,8 +244,6 @@ static int RndisFilterSendRequest(struct rndis_device *Device,
         int ret;
         struct hv_netvsc_packet *packet;
 
-        DPRINT_ENTER(NETVSC);
-
         /* Setup the packet to send it */
         packet = &Request->Packet;
 
@@ -276,8 +274,6 @@ static void RndisFilterReceiveResponse(struct rndis_device *Device,
         bool found = false;
         unsigned long flags;
 
-        DPRINT_ENTER(NETVSC);
-
         spin_lock_irqsave(&Device->request_lock, flags);
         list_for_each_entry(request, &Device->RequestList, ListEntry) {
                 /*
@@ -353,8 +349,6 @@ static void RndisFilterReceiveData(struct rndis_device *Device,
         struct rndis_packet *rndisPacket;
         u32 dataOffset;
 
-        DPRINT_ENTER(NETVSC);
-
         /* empty ethernet frame ?? */
         /* ASSERT(Packet->PageBuffers[0].Length > */
         /*      RNDIS_MESSAGE_SIZE(struct rndis_packet)); */
@@ -389,8 +383,6 @@ static int RndisFilterOnReceive(struct hv_device *Device,
         struct rndis_message rndisMessage;
         struct rndis_message *rndisHeader;
 
-        DPRINT_ENTER(NETVSC);
-
         if (!netDevice)
                 return -EINVAL;
 
@@ -492,8 +484,6 @@ static int RndisFilterQueryDevice(struct rndis_device *Device, u32 Oid,
         struct rndis_query_complete *queryComplete;
         int ret = 0;
 
-        DPRINT_ENTER(NETVSC);
-
         if (!Result)
                 return -EINVAL;
 
@@ -568,8 +558,6 @@ static int RndisFilterSetPacketFilter(struct rndis_device *Device,
         u32 status;
         int ret;
 
-        DPRINT_ENTER(NETVSC);
-
         /* ASSERT(RNDIS_MESSAGE_SIZE(struct rndis_set_request) + sizeof(u32) <= */
         /*      sizeof(struct rndis_message)); */
 
@@ -621,8 +609,6 @@ Exit:
 
 int RndisFilterInit(struct netvsc_driver *Driver)
 {
-        DPRINT_ENTER(NETVSC);
-
         DPRINT_DBG(NETVSC, "sizeof(struct rndis_filter_packet) == %zd",
                    sizeof(struct rndis_filter_packet));
 
@@ -671,8 +657,6 @@ static int RndisFilterInitDevice(struct rndis_device *Device)
         u32 status;
         int ret;
 
-        DPRINT_ENTER(NETVSC);
-
         request = GetRndisRequest(Device, REMOTE_NDIS_INITIALIZE_MSG,
                         RNDIS_MESSAGE_SIZE(struct rndis_initialize_request));
         if (!request) {
@@ -720,8 +704,6 @@ static void RndisFilterHaltDevice(struct rndis_device *Device)
         struct rndis_request *request;
         struct rndis_halt_request *halt;
 
-        DPRINT_ENTER(NETVSC);
-
         /* Attempt to do a rndis device halt */
         request = GetRndisRequest(Device, REMOTE_NDIS_HALT_MSG,
                                 RNDIS_MESSAGE_SIZE(struct rndis_halt_request));
@@ -748,8 +730,6 @@ static int RndisFilterOpenDevice(struct rndis_device *Device)
 {
         int ret;
 
-        DPRINT_ENTER(NETVSC);
-
         if (Device->State != RNDIS_DEV_INITIALIZED)
                 return 0;
 
@@ -768,8 +748,6 @@ static int RndisFilterCloseDevice(struct rndis_device *Device)
 {
         int ret;
 
-        DPRINT_ENTER(NETVSC);
-
         if (Device->State != RNDIS_DEV_DATAINITIALIZED)
                 return 0;
 
@@ -790,8 +768,6 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
         struct rndis_device *rndisDevice;
         struct netvsc_device_info *deviceInfo = AdditionalInfo;
 
-        DPRINT_ENTER(NETVSC);
-
         rndisDevice = GetRndisDevice();
         if (!rndisDevice) {
                 DPRINT_EXIT(NETVSC);
@@ -859,8 +835,6 @@ static int RndisFilterOnDeviceRemove(struct hv_device *Device)
         struct netvsc_device *netDevice = Device->Extension;
         struct rndis_device *rndisDevice = netDevice->Extension;
 
-        DPRINT_ENTER(NETVSC);
-
         /* Halt and release the rndis device */
         RndisFilterHaltDevice(rndisDevice);
 
@@ -877,8 +851,6 @@ static int RndisFilterOnDeviceRemove(struct hv_device *Device)
 
 static void RndisFilterOnCleanup(struct hv_driver *Driver)
 {
-        DPRINT_ENTER(NETVSC);
-
         DPRINT_EXIT(NETVSC);
 }
 
@@ -887,8 +859,6 @@ int RndisFilterOnOpen(struct hv_device *Device)
         int ret;
         struct netvsc_device *netDevice = Device->Extension;
 
-        DPRINT_ENTER(NETVSC);
-
         if (!netDevice)
                 return -EINVAL;
 
@@ -904,8 +874,6 @@ int RndisFilterOnClose(struct hv_device *Device)
         int ret;
         struct netvsc_device *netDevice = Device->Extension;
 
-        DPRINT_ENTER(NETVSC);
-
         if (!netDevice)
                 return -EINVAL;
 
@@ -925,8 +893,6 @@ static int RndisFilterOnSend(struct hv_device *Device,
         struct rndis_packet *rndisPacket;
         u32 rndisMessageSize;
 
-        DPRINT_ENTER(NETVSC);
-
         /* Add the rndis header */
         filterPacket = (struct rndis_filter_packet *)Packet->Extension;
         /* ASSERT(filterPacket); */
@@ -980,8 +946,6 @@ static void RndisFilterOnSendCompletion(void *Context)
 {
         struct rndis_filter_packet *filterPacket = Context;
 
-        DPRINT_ENTER(NETVSC);
-
         /* Pass it back to the original handler */
         filterPacket->OnCompletion(filterPacket->CompletionContext);
 
@@ -991,8 +955,6 @@ static void RndisFilterOnSendCompletion(void *Context)
 
 static void RndisFilterOnSendRequestCompletion(void *Context)
 {
-        DPRINT_ENTER(NETVSC);
-
         /* Noop */
         DPRINT_EXIT(NETVSC);
 }
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 27a276e08ee..7a206858cb1 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -356,8 +356,6 @@ static void StorVscOnIOCompletion(struct hv_device *Device,
         struct hv_storvsc_request *request;
         struct storvsc_device *storDevice;
 
-        DPRINT_ENTER(STORVSC);
-
         storDevice = MustGetStorDevice(Device);
         if (!storDevice) {
                 DPRINT_ERR(STORVSC, "unable to get stor device..."
@@ -449,8 +447,6 @@ static void StorVscOnChannelCallback(void *context)
         struct storvsc_request_extension *request;
         int ret;
 
-        DPRINT_ENTER(STORVSC);
-
         /* ASSERT(device); */
 
         storDevice = MustGetStorDevice(device);
@@ -547,8 +543,6 @@ static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
         struct storvsc_device_info *deviceInfo;
         int ret = 0;
 
-        DPRINT_ENTER(STORVSC);
-
         deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
         storDevice = AllocStorDevice(Device);
         if (!storDevice) {
@@ -596,8 +590,6 @@ static int StorVscOnDeviceRemove(struct hv_device *Device)
 {
         struct storvsc_device *storDevice;
 
-        DPRINT_ENTER(STORVSC);
-
         DPRINT_INFO(STORVSC, "disabling storage device (%p)...",
                     Device->Extension);
 
@@ -637,8 +629,6 @@ int StorVscOnHostReset(struct hv_device *Device)
         struct vstor_packet *vstorPacket;
         int ret;
 
-        DPRINT_ENTER(STORVSC);
-
         DPRINT_INFO(STORVSC, "resetting host adapter...");
 
         storDevice = GetStorDevice(Device);
@@ -702,8 +692,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
         struct vstor_packet *vstorPacket;
         int ret = 0;
 
-        DPRINT_ENTER(STORVSC);
-
         requestExtension =
                 (struct storvsc_request_extension *)Request->Extension;
         vstorPacket = &requestExtension->VStorPacket;
@@ -796,7 +784,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
  */
 static void StorVscOnCleanup(struct hv_driver *Driver)
 {
-        DPRINT_ENTER(STORVSC);
         DPRINT_EXIT(STORVSC);
 }
 
@@ -807,8 +794,6 @@ int StorVscInitialize(struct hv_driver *Driver)
 {
         struct storvsc_driver_object *storDriver;
 
-        DPRINT_ENTER(STORVSC);
-
         storDriver = (struct storvsc_driver_object *)Driver;
 
         DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd "
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index d22e35f598b..16d468529cd 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -141,8 +141,6 @@ static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
         struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj;
         struct driver_context *drv_ctx = &g_storvsc_drv.drv_ctx;
 
-        DPRINT_ENTER(STORVSC_DRV);
-
         vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);
 
         storvsc_drv_obj->RingBufferSize = storvsc_ringbuffer_size;
@@ -194,8 +192,6 @@ static void storvsc_drv_exit(void)
         struct device *current_dev = NULL;
         int ret;
 
-        DPRINT_ENTER(STORVSC_DRV);
-
         while (1) {
                 current_dev = NULL;
 
@@ -243,8 +239,6 @@ static int storvsc_probe(struct device *device)
         struct host_device_context *host_device_ctx;
         struct storvsc_device_info device_info;
 
-        DPRINT_ENTER(STORVSC_DRV);
-
         if (!storvsc_drv_obj->Base.OnDeviceAdd)
                 return -1;
 
@@ -340,8 +334,6 @@ static int storvsc_remove(struct device *device)
                         (struct host_device_context *)host->hostdata;
 
 
-        DPRINT_ENTER(STORVSC_DRV);
-
         if (!storvsc_drv_obj->Base.OnDeviceRemove) {
                 DPRINT_EXIT(STORVSC_DRV);
                 return -1;
@@ -393,8 +385,6 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)
         /*        (unsigned long)cmd_request); */
         /* ASSERT(scmnd->scsi_done); */
 
-        DPRINT_ENTER(STORVSC_DRV);
-
         if (cmd_request->bounce_sgl_count) {
                 /* using bounce buffer */
                 /* printk("copy_from_bounce_buffer\n"); */
@@ -647,8 +637,6 @@ static int storvsc_queuecommand(struct scsi_cmnd *scmnd,
         int i;
         struct scatterlist *sgl;
 
-        DPRINT_ENTER(STORVSC_DRV);
-
         DPRINT_DBG(STORVSC_DRV, "scmnd %p dir %d, use_sg %d buf %p len %d "
                    "queue depth %d tagged %d", scmnd, scmnd->sc_data_direction,
                    scsi_sg_count(scmnd), scsi_sglist(scmnd),
@@ -873,8 +861,6 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
                 (struct host_device_context *)scmnd->device->host->hostdata;
         struct vm_device *device_ctx = host_device_ctx->device_ctx;
 
-        DPRINT_ENTER(STORVSC_DRV);
-
         DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...",
                     scmnd->device, &device_ctx->device_obj);
 
@@ -977,7 +963,6 @@ static int __init storvsc_init(void)
 {
         int ret;
 
-        DPRINT_ENTER(STORVSC_DRV);
         DPRINT_INFO(STORVSC_DRV, "Storvsc initializing....");
         ret = storvsc_drv_init(StorVscInitialize);
         DPRINT_EXIT(STORVSC_DRV);
@@ -986,9 +971,7 @@ static int __init storvsc_init(void)
 
 static void __exit storvsc_exit(void)
 {
-        DPRINT_ENTER(STORVSC_DRV);
         storvsc_drv_exit();
-        DPRINT_ENTER(STORVSC_DRV);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index 007543bdb41..f389c3c290f 100644
--- a/drivers/staging/hv/vmbus.c
+++ b/drivers/staging/hv/vmbus.c
@@ -57,7 +57,6 @@ static struct hv_device *gDevice; /* vmbus root device */
  */
 static void VmbusGetChannelOffers(void)
 {
-        DPRINT_ENTER(VMBUS);
         VmbusChannelRequestOffers();
         DPRINT_EXIT(VMBUS);
 }
@@ -120,8 +119,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));
@@ -148,7 +145,6 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
 {
         int ret = 0;
 
-        DPRINT_ENTER(VMBUS);
         VmbusChannelReleaseUnattachedChannels();
         VmbusDisconnect();
         on_each_cpu(HvSynicCleanup, NULL, 1);
@@ -164,7 +160,6 @@ static void VmbusOnCleanup(struct hv_driver *drv)
 {
         /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */
 
-        DPRINT_ENTER(VMBUS);
         HvCleanup();
         DPRINT_EXIT(VMBUS);
 }
@@ -239,8 +234,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",
@@ -271,8 +264,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 +++++++",
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 4f6f64031f8..13003fcf2e2 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -253,8 +253,6 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
         int ret;
         unsigned int vector;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /*
          * Set this up to allow lower layer to callback to add/remove child
          * devices on the bus
@@ -374,8 +372,6 @@ static void vmbus_bus_exit(void)
 
         struct vm_device *dev_ctx = &g_vmbus_drv.device_ctx;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* Remove the root device */
         if (vmbus_drv_obj->Base.OnDeviceRemove)
                 vmbus_drv_obj->Base.OnDeviceRemove(&dev_ctx->device_obj);
@@ -416,8 +412,6 @@ int vmbus_child_driver_register(struct driver_context *driver_ctx)
         struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
         int ret;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         DPRINT_INFO(VMBUS_DRV, "child driver (%p) registering - name %s",
                     driver_ctx, driver_ctx->driver.name);
 
@@ -447,8 +441,6 @@ EXPORT_SYMBOL(vmbus_child_driver_register);
  */
 void vmbus_child_driver_unregister(struct driver_context *driver_ctx)
 {
-        DPRINT_ENTER(VMBUS_DRV);
-
         DPRINT_INFO(VMBUS_DRV, "child driver (%p) unregistering - name %s",
                     driver_ctx, driver_ctx->driver.name);
 
@@ -503,8 +495,6 @@ static struct hv_device *vmbus_child_device_create(struct hv_guid *type,
         struct vm_device *child_device_ctx;
         struct hv_device *child_device_obj;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* Allocate the new child device */
         child_device_ctx = kzalloc(sizeof(struct vm_device), GFP_KERNEL);
         if (!child_device_ctx) {
@@ -561,8 +551,6 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
                                 to_vm_device(child_device_obj);
         static atomic_t device_num = ATOMIC_INIT(0);
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         DPRINT_DBG(VMBUS_DRV, "child device (%p) registering",
                    child_device_ctx);
 
@@ -604,8 +592,6 @@ static void vmbus_child_device_unregister(struct hv_device *device_obj)
 {
         struct vm_device *device_ctx = to_vm_device(device_obj);
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         DPRINT_INFO(VMBUS_DRV, "unregistering child device (%p)",
                     &device_ctx->device);
 
@@ -626,8 +612,6 @@ static void vmbus_child_device_unregister(struct hv_device *device_obj)
  */
 static void vmbus_child_device_destroy(struct hv_device *device_obj)
 {
-        DPRINT_ENTER(VMBUS_DRV);
-
         DPRINT_EXIT(VMBUS_DRV);
 }
 
@@ -643,8 +627,6 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
         struct vm_device *device_ctx = device_to_vm_device(device);
         int ret;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         DPRINT_INFO(VMBUS_DRV, "generating uevent - VMBUS_DEVICE_CLASS_GUID={"
                     "%02x%02x%02x%02x-%02x%02x-%02x%02x-"
                     "%02x%02x%02x%02x%02x%02x%02x%02x}",
@@ -719,8 +701,6 @@ static int vmbus_match(struct device *device, struct device_driver *driver)
         struct driver_context *driver_ctx = driver_to_driver_context(driver);
         struct vm_device *device_ctx = device_to_vm_device(device);
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* We found our driver ? */
         if (memcmp(&device_ctx->class_id, &driver_ctx->class_id,
                    sizeof(struct hv_guid)) == 0) {
@@ -756,8 +736,6 @@ static void vmbus_probe_failed_cb(struct work_struct *context)
 {
         struct vm_device *device_ctx = (struct vm_device *)context;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /*
          * Kick off the process of unregistering the device.
          * This will call vmbus_remove() and eventually vmbus_device_release()
@@ -779,8 +757,6 @@ static int vmbus_probe(struct device *child_device)
         struct vm_device *device_ctx =
                         device_to_vm_device(child_device);
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* Let the specific open-source driver handles the probe if it can */
         if (driver_ctx->probe) {
                 ret = device_ctx->probe_error = driver_ctx->probe(child_device);
@@ -812,8 +788,6 @@ static int vmbus_remove(struct device *child_device)
         int ret;
         struct driver_context *driver_ctx;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* Special case root bus device */
         if (child_device->parent == NULL) {
                 /*
@@ -853,8 +827,6 @@ static void vmbus_shutdown(struct device *child_device)
 {
         struct driver_context *driver_ctx;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* Special case root bus device */
         if (child_device->parent == NULL) {
                 /*
@@ -887,7 +859,6 @@ static void vmbus_shutdown(struct device *child_device)
  */
 static void vmbus_bus_release(struct device *device)
 {
-        DPRINT_ENTER(VMBUS_DRV);
         /* FIXME */
         /* Empty release functions are a bug, or a major sign
          * of a problem design, this MUST BE FIXED! */
@@ -903,8 +874,6 @@ static void vmbus_device_release(struct device *device)
 {
         struct vm_device *device_ctx = device_to_vm_device(device);
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* vmbus_child_device_destroy(&device_ctx->device_obj); */
         kfree(device_ctx);
 
@@ -921,8 +890,6 @@ static void vmbus_msg_dpc(unsigned long data)
 {
         struct vmbus_driver *vmbus_drv_obj = (struct vmbus_driver *)data;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* ASSERT(vmbus_drv_obj->OnMsgDpc != NULL); */
 
         /* Call to bus driver to handle interrupt */
@@ -938,8 +905,6 @@ static void vmbus_event_dpc(unsigned long data)
 {
         struct vmbus_driver *vmbus_drv_obj = (struct vmbus_driver *)data;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* ASSERT(vmbus_drv_obj->OnEventDpc != NULL); */
 
         /* Call to bus driver to handle interrupt */
@@ -953,8 +918,6 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
         struct vmbus_driver *vmbus_driver_obj = &g_vmbus_drv.drv_obj;
         int ret;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         /* ASSERT(vmbus_driver_obj->OnIsr != NULL); */
 
         /* Call to bus driver to handle interrupt */
@@ -993,8 +956,6 @@ static int __init vmbus_init(void)
 {
         int ret = 0;
 
-        DPRINT_ENTER(VMBUS_DRV);
-
         DPRINT_INFO(VMBUS_DRV,
                 "Vmbus initializing.... current log level 0x%x (%x,%x)",
                 vmbus_loglevel, HIWORD(vmbus_loglevel), LOWORD(vmbus_loglevel));
@@ -1011,8 +972,6 @@ static int __init vmbus_init(void)
 
 static void __exit vmbus_exit(void)
 {
-        DPRINT_ENTER(VMBUS_DRV);
-
         vmbus_bus_exit();
         /* Todo: it is used for loglevel, to be ported to new kernel. */
         DPRINT_EXIT(VMBUS_DRV);