aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-07-22 18:14:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-22 18:14:04 -0400
commit83c720ea395c4ee725e1035cbcda809794b46091 (patch)
treeba683a1eef41cfca86286a2d81d49068ac12d478
parent2acadc269fa1957438e64684460c27a33e6d2b08 (diff)
Staging: hv: remove DPRINT_EXIT macro
No need for it, use the built-in kernel function tracing instead if you really need something like this. Cc: Hank Janssen <hjanssen@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/hv/blkvsc.c8
-rw-r--r--drivers/staging/hv/blkvsc_drv.c14
-rw-r--r--drivers/staging/hv/channel.c31
-rw-r--r--drivers/staging/hv/channel_mgmt.c21
-rw-r--r--drivers/staging/hv/connection.c15
-rw-r--r--drivers/staging/hv/hv.c21
-rw-r--r--drivers/staging/hv/hv_utils.c6
-rw-r--r--drivers/staging/hv/logging.h10
-rw-r--r--drivers/staging/hv/netvsc.c35
-rw-r--r--drivers/staging/hv/netvsc_drv.c29
-rw-r--r--drivers/staging/hv/ring_buffer.c6
-rw-r--r--drivers/staging/hv/rndis_filter.c48
-rw-r--r--drivers/staging/hv/storvsc.c21
-rw-r--r--drivers/staging/hv/storvsc_drv.c32
-rw-r--r--drivers/staging/hv/vmbus.c9
-rw-r--r--drivers/staging/hv/vmbus_drv.c56
16 files changed, 14 insertions, 348 deletions
diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c
index 3aeeda2cbe7..929238a6ce8 100644
--- a/drivers/staging/hv/blkvsc.c
+++ b/drivers/staging/hv/blkvsc.c
@@ -43,10 +43,8 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
43 deviceInfo = (struct storvsc_device_info *)AdditionalInfo; 43 deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
44 44
45 ret = StorVscOnDeviceAdd(Device, AdditionalInfo); 45 ret = StorVscOnDeviceAdd(Device, AdditionalInfo);
46 if (ret != 0) { 46 if (ret != 0)
47 DPRINT_EXIT(BLKVSC);
48 return ret; 47 return ret;
49 }
50 48
51 /* 49 /*
52 * We need to use the device instance guid to set the path and target 50 * We need to use the device instance guid to set the path and target
@@ -61,8 +59,6 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
61 deviceInfo->TargetId = Device->deviceInstance.data[5] << 8 | 59 deviceInfo->TargetId = Device->deviceInstance.data[5] << 8 |
62 Device->deviceInstance.data[4]; 60 Device->deviceInstance.data[4];
63 61
64 DPRINT_EXIT(BLKVSC);
65
66 return ret; 62 return ret;
67} 63}
68 64
@@ -102,7 +98,5 @@ int BlkVscInitialize(struct hv_driver *Driver)
102 storDriver->Base.OnCleanup = StorVscOnCleanup; 98 storDriver->Base.OnCleanup = StorVscOnCleanup;
103 storDriver->OnIORequest = StorVscOnIORequest; 99 storDriver->OnIORequest = StorVscOnIORequest;
104 100
105 DPRINT_EXIT(BLKVSC);
106
107 return ret; 101 return ret;
108} 102}
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index f134021d48d..f7ea2a3efed 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -193,8 +193,6 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
193 /* The driver belongs to vmbus */ 193 /* The driver belongs to vmbus */
194 ret = vmbus_child_driver_register(drv_ctx); 194 ret = vmbus_child_driver_register(drv_ctx);
195 195
196 DPRINT_EXIT(BLKVSC_DRV);
197
198 return ret; 196 return ret;
199} 197}
200 198
@@ -237,8 +235,6 @@ static void blkvsc_drv_exit(void)
237 235
238 vmbus_child_driver_unregister(drv_ctx); 236 vmbus_child_driver_unregister(drv_ctx);
239 237
240 DPRINT_EXIT(BLKVSC_DRV);
241
242 return; 238 return;
243} 239}
244 240
@@ -407,8 +403,6 @@ Cleanup:
407 blkdev = NULL; 403 blkdev = NULL;
408 } 404 }
409 405
410 DPRINT_EXIT(BLKVSC_DRV);
411
412 return ret; 406 return ret;
413} 407}
414 408
@@ -747,10 +741,8 @@ static int blkvsc_remove(struct device *device)
747 741
748 DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n"); 742 DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");
749 743
750 if (!storvsc_drv_obj->Base.OnDeviceRemove) { 744 if (!storvsc_drv_obj->Base.OnDeviceRemove)
751 DPRINT_EXIT(BLKVSC_DRV);
752 return -1; 745 return -1;
753 }
754 746
755 /* 747 /*
756 * Call to the vsc driver to let it know that the device is being 748 * Call to the vsc driver to let it know that the device is being
@@ -794,8 +786,6 @@ static int blkvsc_remove(struct device *device)
794 786
795 kfree(blkdev); 787 kfree(blkdev);
796 788
797 DPRINT_EXIT(BLKVSC_DRV);
798
799 return ret; 789 return ret;
800} 790}
801 791
@@ -1488,8 +1478,6 @@ static int __init blkvsc_init(void)
1488 1478
1489 ret = blkvsc_drv_init(BlkVscInitialize); 1479 ret = blkvsc_drv_init(BlkVscInitialize);
1490 1480
1491 DPRINT_EXIT(BLKVSC_DRV);
1492
1493 return ret; 1481 return ret;
1494} 1482}
1495 1483
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index de5b1f2b3a8..fece30c303a 100644
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -90,8 +90,6 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel)
90 } else { 90 } else {
91 VmbusSetEvent(Channel->OfferMsg.ChildRelId); 91 VmbusSetEvent(Channel->OfferMsg.ChildRelId);
92 } 92 }
93
94 DPRINT_EXIT(VMBUS);
95} 93}
96 94
97#if 0 95#if 0
@@ -113,8 +111,6 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
113 (unsigned long *)&monitorPage->TriggerGroup 111 (unsigned long *)&monitorPage->TriggerGroup
114 [Channel->MonitorGroup].Pending); 112 [Channel->MonitorGroup].Pending);
115 } 113 }
116
117 DPRINT_EXIT(VMBUS);
118} 114}
119 115
120#endif 116#endif
@@ -299,9 +295,6 @@ Cleanup:
299 295
300 kfree(openInfo->WaitEvent); 296 kfree(openInfo->WaitEvent);
301 kfree(openInfo); 297 kfree(openInfo);
302
303 DPRINT_EXIT(VMBUS);
304
305 return 0; 298 return 0;
306 299
307errorout: 300errorout:
@@ -586,9 +579,6 @@ Cleanup:
586 579
587 kfree(msgInfo->WaitEvent); 580 kfree(msgInfo->WaitEvent);
588 kfree(msgInfo); 581 kfree(msgInfo);
589
590 DPRINT_EXIT(VMBUS);
591
592 return ret; 582 return ret;
593} 583}
594 584
@@ -642,9 +632,6 @@ int VmbusChannelTeardownGpadl(struct vmbus_channel *Channel, u32 GpadlHandle)
642 632
643 kfree(info->WaitEvent); 633 kfree(info->WaitEvent);
644 kfree(info); 634 kfree(info);
645
646 DPRINT_EXIT(VMBUS);
647
648 return ret; 635 return ret;
649} 636}
650 637
@@ -710,8 +697,6 @@ void VmbusChannelClose(struct vmbus_channel *Channel)
710 697
711 FreeVmbusChannel(Channel); 698 FreeVmbusChannel(Channel);
712 } 699 }
713
714 DPRINT_EXIT(VMBUS);
715} 700}
716 701
717/** 702/**
@@ -765,8 +750,6 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel, const void *Buffer,
765 if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound)) 750 if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))
766 VmbusChannelSetEvent(Channel); 751 VmbusChannelSetEvent(Channel);
767 752
768 DPRINT_EXIT(VMBUS);
769
770 return ret; 753 return ret;
771} 754}
772EXPORT_SYMBOL(VmbusChannelSendPacket); 755EXPORT_SYMBOL(VmbusChannelSendPacket);
@@ -831,8 +814,6 @@ int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel,
831 if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound)) 814 if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))
832 VmbusChannelSetEvent(Channel); 815 VmbusChannelSetEvent(Channel);
833 816
834 DPRINT_EXIT(VMBUS);
835
836 return ret; 817 return ret;
837} 818}
838 819
@@ -899,8 +880,6 @@ int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel,
899 if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound)) 880 if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))
900 VmbusChannelSetEvent(Channel); 881 VmbusChannelSetEvent(Channel);
901 882
902 DPRINT_EXIT(VMBUS);
903
904 return ret; 883 return ret;
905} 884}
906 885
@@ -938,7 +917,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
938 spin_unlock_irqrestore(&Channel->inbound_lock, flags); 917 spin_unlock_irqrestore(&Channel->inbound_lock, flags);
939 918
940 /* DPRINT_DBG(VMBUS, "nothing to read!!"); */ 919 /* DPRINT_DBG(VMBUS, "nothing to read!!"); */
941 DPRINT_EXIT(VMBUS);
942 return 0; 920 return 0;
943 } 921 }
944 922
@@ -960,8 +938,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
960 938
961 DPRINT_ERR(VMBUS, "buffer too small - got %d needs %d", 939 DPRINT_ERR(VMBUS, "buffer too small - got %d needs %d",
962 BufferLen, userLen); 940 BufferLen, userLen);
963 DPRINT_EXIT(VMBUS);
964
965 return -1; 941 return -1;
966 } 942 }
967 943
@@ -973,8 +949,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer,
973 949
974 spin_unlock_irqrestore(&Channel->inbound_lock, flags); 950 spin_unlock_irqrestore(&Channel->inbound_lock, flags);
975 951
976 DPRINT_EXIT(VMBUS);
977
978 return 0; 952 return 0;
979} 953}
980EXPORT_SYMBOL(VmbusChannelRecvPacket); 954EXPORT_SYMBOL(VmbusChannelRecvPacket);
@@ -1003,7 +977,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
1003 spin_unlock_irqrestore(&Channel->inbound_lock, flags); 977 spin_unlock_irqrestore(&Channel->inbound_lock, flags);
1004 978
1005 /* DPRINT_DBG(VMBUS, "nothing to read!!"); */ 979 /* DPRINT_DBG(VMBUS, "nothing to read!!"); */
1006 DPRINT_EXIT(VMBUS);
1007 return 0; 980 return 0;
1008 } 981 }
1009 982
@@ -1024,7 +997,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
1024 997
1025 DPRINT_ERR(VMBUS, "buffer too small - needed %d bytes but " 998 DPRINT_ERR(VMBUS, "buffer too small - needed %d bytes but "
1026 "got space for only %d bytes", packetLen, BufferLen); 999 "got space for only %d bytes", packetLen, BufferLen);
1027 DPRINT_EXIT(VMBUS);
1028 return -2; 1000 return -2;
1029 } 1001 }
1030 1002
@@ -1034,9 +1006,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer,
1034 ret = RingBufferRead(&Channel->Inbound, Buffer, packetLen, 0); 1006 ret = RingBufferRead(&Channel->Inbound, Buffer, packetLen, 0);
1035 1007
1036 spin_unlock_irqrestore(&Channel->inbound_lock, flags); 1008 spin_unlock_irqrestore(&Channel->inbound_lock, flags);
1037
1038 DPRINT_EXIT(VMBUS);
1039
1040 return 0; 1009 return 0;
1041} 1010}
1042 1011
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index 9c86efc78eb..994abd22973 100644
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -271,8 +271,6 @@ static inline void ReleaseVmbusChannel(void *context)
271 DPRINT_DBG(VMBUS, "channel released (%p)", channel); 271 DPRINT_DBG(VMBUS, "channel released (%p)", channel);
272 272
273 kfree(channel); 273 kfree(channel);
274
275 DPRINT_EXIT(VMBUS);
276} 274}
277 275
278/* 276/*
@@ -329,7 +327,6 @@ static void VmbusChannelProcessOffer(void *context)
329 DPRINT_DBG(VMBUS, "Ignoring duplicate offer for relid (%d)", 327 DPRINT_DBG(VMBUS, "Ignoring duplicate offer for relid (%d)",
330 newChannel->OfferMsg.ChildRelId); 328 newChannel->OfferMsg.ChildRelId);
331 FreeVmbusChannel(newChannel); 329 FreeVmbusChannel(newChannel);
332 DPRINT_EXIT(VMBUS);
333 return; 330 return;
334 } 331 }
335 332
@@ -387,7 +384,6 @@ static void VmbusChannelProcessOffer(void *context)
387 cnt++; 384 cnt++;
388 } 385 }
389 } 386 }
390 DPRINT_EXIT(VMBUS);
391} 387}
392 388
393/* 389/*
@@ -398,7 +394,6 @@ static void VmbusChannelProcessRescindOffer(void *context)
398 struct vmbus_channel *channel = context; 394 struct vmbus_channel *channel = context;
399 395
400 VmbusChildDeviceRemove(channel->DeviceObject); 396 VmbusChildDeviceRemove(channel->DeviceObject);
401 DPRINT_EXIT(VMBUS);
402} 397}
403 398
404/* 399/*
@@ -429,7 +424,6 @@ static void VmbusChannelOnOffer(struct vmbus_channel_message_header *hdr)
429 if (!fSupported) { 424 if (!fSupported) {
430 DPRINT_DBG(VMBUS, "Ignoring channel offer notification for " 425 DPRINT_DBG(VMBUS, "Ignoring channel offer notification for "
431 "child relid %d", offer->ChildRelId); 426 "child relid %d", offer->ChildRelId);
432 DPRINT_EXIT(VMBUS);
433 return; 427 return;
434 } 428 }
435 429
@@ -478,8 +472,6 @@ static void VmbusChannelOnOffer(struct vmbus_channel_message_header *hdr)
478 /* TODO: Make sure the offer comes from our parent partition */ 472 /* TODO: Make sure the offer comes from our parent partition */
479 osd_schedule_callback(newChannel->ControlWQ, VmbusChannelProcessOffer, 473 osd_schedule_callback(newChannel->ControlWQ, VmbusChannelProcessOffer,
480 newChannel); 474 newChannel);
481
482 DPRINT_EXIT(VMBUS);
483} 475}
484 476
485/* 477/*
@@ -503,8 +495,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr)
503 osd_schedule_callback(channel->ControlWQ, 495 osd_schedule_callback(channel->ControlWQ,
504 VmbusChannelProcessRescindOffer, 496 VmbusChannelProcessRescindOffer,
505 channel); 497 channel);
506
507 DPRINT_EXIT(VMBUS);
508} 498}
509 499
510/* 500/*
@@ -515,7 +505,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr)
515static void VmbusChannelOnOffersDelivered( 505static void VmbusChannelOnOffersDelivered(
516 struct vmbus_channel_message_header *hdr) 506 struct vmbus_channel_message_header *hdr)
517{ 507{
518 DPRINT_EXIT(VMBUS);
519} 508}
520 509
521/* 510/*
@@ -560,8 +549,6 @@ static void VmbusChannelOnOpenResult(struct vmbus_channel_message_header *hdr)
560 } 549 }
561 } 550 }
562 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags); 551 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
563
564 DPRINT_EXIT(VMBUS);
565} 552}
566 553
567/* 554/*
@@ -610,8 +597,6 @@ static void VmbusChannelOnGpadlCreated(struct vmbus_channel_message_header *hdr)
610 } 597 }
611 } 598 }
612 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags); 599 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
613
614 DPRINT_EXIT(VMBUS);
615} 600}
616 601
617/* 602/*
@@ -656,8 +641,6 @@ static void VmbusChannelOnGpadlTorndown(
656 } 641 }
657 } 642 }
658 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags); 643 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
659
660 DPRINT_EXIT(VMBUS);
661} 644}
662 645
663/* 646/*
@@ -695,8 +678,6 @@ static void VmbusChannelOnVersionResponse(
695 } 678 }
696 } 679 }
697 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags); 680 spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
698
699 DPRINT_EXIT(VMBUS);
700} 681}
701 682
702/* Channel message dispatch table */ 683/* Channel message dispatch table */
@@ -755,7 +736,6 @@ void VmbusOnChannelMessage(void *Context)
755 736
756 /* Free the msg that was allocated in VmbusOnMsgDPC() */ 737 /* Free the msg that was allocated in VmbusOnMsgDPC() */
757 kfree(msg); 738 kfree(msg);
758 DPRINT_EXIT(VMBUS);
759} 739}
760 740
761/* 741/*
@@ -812,7 +792,6 @@ Cleanup:
812 kfree(msgInfo); 792 kfree(msgInfo);
813 } 793 }
814 794
815 DPRINT_EXIT(VMBUS);
816 return ret; 795 return ret;
817} 796}
818 797
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index b8dd8f9206b..1f4d6683aaa 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -153,8 +153,6 @@ int VmbusConnect(void)
153 153
154 kfree(msgInfo->WaitEvent); 154 kfree(msgInfo->WaitEvent);
155 kfree(msgInfo); 155 kfree(msgInfo);
156 DPRINT_EXIT(VMBUS);
157
158 return 0; 156 return 0;
159 157
160Cleanup: 158Cleanup:
@@ -178,8 +176,6 @@ Cleanup:
178 kfree(msgInfo); 176 kfree(msgInfo);
179 } 177 }
180 178
181 DPRINT_EXIT(VMBUS);
182
183 return ret; 179 return ret;
184} 180}
185 181
@@ -217,7 +213,6 @@ int VmbusDisconnect(void)
217 213
218Cleanup: 214Cleanup:
219 kfree(msg); 215 kfree(msg);
220 DPRINT_EXIT(VMBUS);
221 return ret; 216 return ret;
222} 217}
223 218
@@ -304,8 +299,6 @@ void VmbusOnEvents(void)
304 } 299 }
305 } 300 }
306 } 301 }
307 DPRINT_EXIT(VMBUS);
308
309 return; 302 return;
310} 303}
311 304
@@ -326,16 +319,10 @@ int VmbusPostMessage(void *buffer, size_t bufferLen)
326 */ 319 */
327int VmbusSetEvent(u32 childRelId) 320int VmbusSetEvent(u32 childRelId)
328{ 321{
329 int ret = 0;
330
331 /* Each u32 represents 32 channels */ 322 /* Each u32 represents 32 channels */
332 set_bit(childRelId & 31, 323 set_bit(childRelId & 31,
333 (unsigned long *)gVmbusConnection.SendInterruptPage + 324 (unsigned long *)gVmbusConnection.SendInterruptPage +
334 (childRelId >> 5)); 325 (childRelId >> 5));
335 326
336 ret = HvSignalEvent(); 327 return HvSignalEvent();
337
338 DPRINT_EXIT(VMBUS);
339
340 return ret;
341} 328}
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index 6aa3697a07d..86b1ddd9040 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -273,8 +273,6 @@ int HvInit(void)
273 gHvContext.SignalEventParam->FlagNumber = 0; 273 gHvContext.SignalEventParam->FlagNumber = 0;
274 gHvContext.SignalEventParam->RsvdZ = 0; 274 gHvContext.SignalEventParam->RsvdZ = 0;
275 275
276 DPRINT_EXIT(VMBUS);
277
278 return ret; 276 return ret;
279 277
280Cleanup: 278Cleanup:
@@ -287,8 +285,6 @@ Cleanup:
287 vfree(virtAddr); 285 vfree(virtAddr);
288 } 286 }
289 ret = -1; 287 ret = -1;
290 DPRINT_EXIT(VMBUS);
291
292 return ret; 288 return ret;
293} 289}
294 290
@@ -311,8 +307,6 @@ void HvCleanup(void)
311 vfree(gHvContext.HypercallPage); 307 vfree(gHvContext.HypercallPage);
312 gHvContext.HypercallPage = NULL; 308 gHvContext.HypercallPage = NULL;
313 } 309 }
314
315 DPRINT_EXIT(VMBUS);
316} 310}
317 311
318/* 312/*
@@ -388,10 +382,8 @@ void HvSynicInit(void *irqarg)
388 u32 irqVector = *((u32 *)(irqarg)); 382 u32 irqVector = *((u32 *)(irqarg));
389 int cpu = smp_processor_id(); 383 int cpu = smp_processor_id();
390 384
391 if (!gHvContext.HypercallPage) { 385 if (!gHvContext.HypercallPage)
392 DPRINT_EXIT(VMBUS);
393 return; 386 return;
394 }
395 387
396 /* Check the version */ 388 /* Check the version */
397 rdmsrl(HV_X64_MSR_SVERSION, version); 389 rdmsrl(HV_X64_MSR_SVERSION, version);
@@ -458,9 +450,6 @@ void HvSynicInit(void *irqarg)
458 wrmsrl(HV_X64_MSR_SCONTROL, sctrl.AsUINT64); 450 wrmsrl(HV_X64_MSR_SCONTROL, sctrl.AsUINT64);
459 451
460 gHvContext.SynICInitialized = true; 452 gHvContext.SynICInitialized = true;
461
462 DPRINT_EXIT(VMBUS);
463
464 return; 453 return;
465 454
466Cleanup: 455Cleanup:
@@ -469,8 +458,6 @@ Cleanup:
469 458
470 if (gHvContext.synICMessagePage[cpu]) 459 if (gHvContext.synICMessagePage[cpu])
471 osd_PageFree(gHvContext.synICMessagePage[cpu], 1); 460 osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
472
473 DPRINT_EXIT(VMBUS);
474 return; 461 return;
475} 462}
476 463
@@ -484,10 +471,8 @@ void HvSynicCleanup(void *arg)
484 union hv_synic_siefp siefp; 471 union hv_synic_siefp siefp;
485 int cpu = smp_processor_id(); 472 int cpu = smp_processor_id();
486 473
487 if (!gHvContext.SynICInitialized) { 474 if (!gHvContext.SynICInitialized)
488 DPRINT_EXIT(VMBUS);
489 return; 475 return;
490 }
491 476
492 rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64); 477 rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
493 478
@@ -511,6 +496,4 @@ void HvSynicCleanup(void *arg)
511 496
512 osd_PageFree(gHvContext.synICMessagePage[cpu], 1); 497 osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
513 osd_PageFree(gHvContext.synICEventPage[cpu], 1); 498 osd_PageFree(gHvContext.synICEventPage[cpu], 1);
514
515 DPRINT_EXIT(VMBUS);
516} 499}
diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c
index 08cde24de2a..d8c76b1fc1b 100644
--- a/drivers/staging/hv/hv_utils.c
+++ b/drivers/staging/hv/hv_utils.c
@@ -98,8 +98,6 @@ static void shutdown_onchannelcallback(void *context)
98 98
99 kfree(buf); 99 kfree(buf);
100 100
101 DPRINT_EXIT(VMBUS);
102
103 if (execute_shutdown == true) 101 if (execute_shutdown == true)
104 orderly_poweroff(false); 102 orderly_poweroff(false);
105} 103}
@@ -186,8 +184,6 @@ static void timesync_onchannelcallback(void *context)
186 } 184 }
187 185
188 kfree(buf); 186 kfree(buf);
189
190 DPRINT_EXIT(VMBUS);
191} 187}
192 188
193/* 189/*
@@ -241,8 +237,6 @@ static void heartbeat_onchannelcallback(void *context)
241 } 237 }
242 238
243 kfree(buf); 239 kfree(buf);
244
245 DPRINT_EXIT(VMBUS);
246} 240}
247 241
248static int __init init_hyperv_utils(void) 242static int __init init_hyperv_utils(void)
diff --git a/drivers/staging/hv/logging.h b/drivers/staging/hv/logging.h
index 090cda7d027..20d4d12023d 100644
--- a/drivers/staging/hv/logging.h
+++ b/drivers/staging/hv/logging.h
@@ -92,14 +92,4 @@ extern unsigned int vmbus_loglevel;
92 __func__, ## args);\ 92 __func__, ## args);\
93 } while (0) 93 } while (0)
94 94
95#ifdef DEBUG
96#define DPRINT_EXIT(mod) do {\
97 if ((mod & (HIWORD(vmbus_loglevel))) && \
98 (DEBUG_LVL_ENTEREXIT <= LOWORD(vmbus_loglevel))) \
99 printk(KERN_DEBUG "["#mod"]: %s() exit\n", __func__);\
100 } while (0)
101#else
102#define DPRINT_EXIT(mod)
103#endif
104
105#endif /* _LOGGING_H_ */ 95#endif /* _LOGGING_H_ */
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 3f79f04a206..1d2ebbe17e2 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -200,9 +200,6 @@ int NetVscInitialize(struct hv_driver *drv)
200 driver->OnSend = NetVscOnSend; 200 driver->OnSend = NetVscOnSend;
201 201
202 RndisFilterInit(driver); 202 RndisFilterInit(driver);
203
204 DPRINT_EXIT(NETVSC);
205
206 return 0; 203 return 0;
207} 204}
208 205
@@ -216,7 +213,6 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
216 if (!netDevice) { 213 if (!netDevice) {
217 DPRINT_ERR(NETVSC, "unable to get net device..." 214 DPRINT_ERR(NETVSC, "unable to get net device..."
218 "device being destroyed?"); 215 "device being destroyed?");
219 DPRINT_EXIT(NETVSC);
220 return -1; 216 return -1;
221 } 217 }
222 /* ASSERT(netDevice->ReceiveBufferSize > 0); */ 218 /* ASSERT(netDevice->ReceiveBufferSize > 0); */
@@ -331,7 +327,6 @@ Cleanup:
331 327
332Exit: 328Exit:
333 PutNetDevice(Device); 329 PutNetDevice(Device);
334 DPRINT_EXIT(NETVSC);
335 return ret; 330 return ret;
336} 331}
337 332
@@ -345,7 +340,6 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
345 if (!netDevice) { 340 if (!netDevice) {
346 DPRINT_ERR(NETVSC, "unable to get net device..." 341 DPRINT_ERR(NETVSC, "unable to get net device..."
347 "device being destroyed?"); 342 "device being destroyed?");
348 DPRINT_EXIT(NETVSC);
349 return -1; 343 return -1;
350 } 344 }
351 if (netDevice->SendBufferSize <= 0) { 345 if (netDevice->SendBufferSize <= 0) {
@@ -428,7 +422,6 @@ Cleanup:
428 422
429Exit: 423Exit:
430 PutNetDevice(Device); 424 PutNetDevice(Device);
431 DPRINT_EXIT(NETVSC);
432 return ret; 425 return ret;
433} 426}
434 427
@@ -467,7 +460,6 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
467 if (ret != 0) { 460 if (ret != 0) {
468 DPRINT_ERR(NETVSC, "unable to send revoke receive " 461 DPRINT_ERR(NETVSC, "unable to send revoke receive "
469 "buffer to netvsp"); 462 "buffer to netvsp");
470 DPRINT_EXIT(NETVSC);
471 return -1; 463 return -1;
472 } 464 }
473 } 465 }
@@ -484,7 +476,6 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
484 if (ret != 0) { 476 if (ret != 0) {
485 DPRINT_ERR(NETVSC, 477 DPRINT_ERR(NETVSC,
486 "unable to teardown receive buffer's gpadl"); 478 "unable to teardown receive buffer's gpadl");
487 DPRINT_EXIT(NETVSC);
488 return -1; 479 return -1;
489 } 480 }
490 NetDevice->ReceiveBufferGpadlHandle = 0; 481 NetDevice->ReceiveBufferGpadlHandle = 0;
@@ -505,8 +496,6 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
505 NetDevice->ReceiveSections = NULL; 496 NetDevice->ReceiveSections = NULL;
506 } 497 }
507 498
508 DPRINT_EXIT(NETVSC);
509
510 return ret; 499 return ret;
511} 500}
512 501
@@ -544,7 +533,6 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
544 if (ret != 0) { 533 if (ret != 0) {
545 DPRINT_ERR(NETVSC, "unable to send revoke send buffer " 534 DPRINT_ERR(NETVSC, "unable to send revoke send buffer "
546 "to netvsp"); 535 "to netvsp");
547 DPRINT_EXIT(NETVSC);
548 return -1; 536 return -1;
549 } 537 }
550 } 538 }
@@ -562,7 +550,6 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
562 if (ret != 0) { 550 if (ret != 0) {
563 DPRINT_ERR(NETVSC, "unable to teardown send buffer's " 551 DPRINT_ERR(NETVSC, "unable to teardown send buffer's "
564 "gpadl"); 552 "gpadl");
565 DPRINT_EXIT(NETVSC);
566 return -1; 553 return -1;
567 } 554 }
568 NetDevice->SendBufferGpadlHandle = 0; 555 NetDevice->SendBufferGpadlHandle = 0;
@@ -577,8 +564,6 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
577 NetDevice->SendBuffer = NULL; 564 NetDevice->SendBuffer = NULL;
578 } 565 }
579 566
580 DPRINT_EXIT(NETVSC);
581
582 return ret; 567 return ret;
583} 568}
584 569
@@ -594,7 +579,6 @@ static int NetVscConnectToVsp(struct hv_device *Device)
594 if (!netDevice) { 579 if (!netDevice) {
595 DPRINT_ERR(NETVSC, "unable to get net device..." 580 DPRINT_ERR(NETVSC, "unable to get net device..."
596 "device being destroyed?"); 581 "device being destroyed?");
597 DPRINT_EXIT(NETVSC);
598 return -1; 582 return -1;
599 } 583 }
600 584
@@ -684,7 +668,6 @@ static int NetVscConnectToVsp(struct hv_device *Device)
684 668
685Cleanup: 669Cleanup:
686 PutNetDevice(Device); 670 PutNetDevice(Device);
687 DPRINT_EXIT(NETVSC);
688 return ret; 671 return ret;
689} 672}
690 673
@@ -692,8 +675,6 @@ static void NetVscDisconnectFromVsp(struct netvsc_device *NetDevice)
692{ 675{
693 NetVscDestroyReceiveBuffer(NetDevice); 676 NetVscDestroyReceiveBuffer(NetDevice);
694 NetVscDestroySendBuffer(NetDevice); 677 NetVscDestroySendBuffer(NetDevice);
695
696 DPRINT_EXIT(NETVSC);
697} 678}
698 679
699/* 680/*
@@ -771,7 +752,6 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
771 DPRINT_INFO(NETVSC, "*** NetVSC channel handshake result - %d ***", 752 DPRINT_INFO(NETVSC, "*** NetVSC channel handshake result - %d ***",
772 ret); 753 ret);
773 754
774 DPRINT_EXIT(NETVSC);
775 return ret; 755 return ret;
776 756
777Close: 757Close:
@@ -796,7 +776,6 @@ Cleanup:
796 FreeNetDevice(netDevice); 776 FreeNetDevice(netDevice);
797 } 777 }
798 778
799 DPRINT_EXIT(NETVSC);
800 return ret; 779 return ret;
801} 780}
802 781
@@ -850,8 +829,6 @@ static int NetVscOnDeviceRemove(struct hv_device *Device)
850 829
851 kfree(netDevice->ChannelInitEvent); 830 kfree(netDevice->ChannelInitEvent);
852 FreeNetDevice(netDevice); 831 FreeNetDevice(netDevice);
853
854 DPRINT_EXIT(NETVSC);
855 return 0; 832 return 0;
856} 833}
857 834
@@ -860,7 +837,6 @@ static int NetVscOnDeviceRemove(struct hv_device *Device)
860 */ 837 */
861static void NetVscOnCleanup(struct hv_driver *drv) 838static void NetVscOnCleanup(struct hv_driver *drv)
862{ 839{
863 DPRINT_EXIT(NETVSC);
864} 840}
865 841
866static void NetVscOnSendCompletion(struct hv_device *Device, 842static void NetVscOnSendCompletion(struct hv_device *Device,
@@ -874,7 +850,6 @@ static void NetVscOnSendCompletion(struct hv_device *Device,
874 if (!netDevice) { 850 if (!netDevice) {
875 DPRINT_ERR(NETVSC, "unable to get net device..." 851 DPRINT_ERR(NETVSC, "unable to get net device..."
876 "device being destroyed?"); 852 "device being destroyed?");
877 DPRINT_EXIT(NETVSC);
878 return; 853 return;
879 } 854 }
880 855
@@ -908,7 +883,6 @@ static void NetVscOnSendCompletion(struct hv_device *Device,
908 } 883 }
909 884
910 PutNetDevice(Device); 885 PutNetDevice(Device);
911 DPRINT_EXIT(NETVSC);
912} 886}
913 887
914static int NetVscOnSend(struct hv_device *Device, 888static int NetVscOnSend(struct hv_device *Device,
@@ -923,7 +897,6 @@ static int NetVscOnSend(struct hv_device *Device,
923 if (!netDevice) { 897 if (!netDevice) {
924 DPRINT_ERR(NETVSC, "net device (%p) shutting down..." 898 DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
925 "ignoring outbound packets", netDevice); 899 "ignoring outbound packets", netDevice);
926 DPRINT_EXIT(NETVSC);
927 return -2; 900 return -2;
928 } 901 }
929 902
@@ -963,8 +936,6 @@ static int NetVscOnSend(struct hv_device *Device,
963 936
964 atomic_inc(&netDevice->NumOutstandingSends); 937 atomic_inc(&netDevice->NumOutstandingSends);
965 PutNetDevice(Device); 938 PutNetDevice(Device);
966
967 DPRINT_EXIT(NETVSC);
968 return ret; 939 return ret;
969} 940}
970 941
@@ -988,7 +959,6 @@ static void NetVscOnReceive(struct hv_device *Device,
988 if (!netDevice) { 959 if (!netDevice) {
989 DPRINT_ERR(NETVSC, "unable to get net device..." 960 DPRINT_ERR(NETVSC, "unable to get net device..."
990 "device being destroyed?"); 961 "device being destroyed?");
991 DPRINT_EXIT(NETVSC);
992 return; 962 return;
993 } 963 }
994 964
@@ -1164,7 +1134,6 @@ static void NetVscOnReceive(struct hv_device *Device,
1164 /* ASSERT(list_empty(&listHead)); */ 1134 /* ASSERT(list_empty(&listHead)); */
1165 1135
1166 PutNetDevice(Device); 1136 PutNetDevice(Device);
1167 DPRINT_EXIT(NETVSC);
1168} 1137}
1169 1138
1170static void NetVscSendReceiveCompletion(struct hv_device *Device, 1139static void NetVscSendReceiveCompletion(struct hv_device *Device,
@@ -1234,7 +1203,6 @@ static void NetVscOnReceiveCompletion(void *Context)
1234 if (!netDevice) { 1203 if (!netDevice) {
1235 DPRINT_ERR(NETVSC, "unable to get net device..." 1204 DPRINT_ERR(NETVSC, "unable to get net device..."
1236 "device being destroyed?"); 1205 "device being destroyed?");
1237 DPRINT_EXIT(NETVSC);
1238 return; 1206 return;
1239 } 1207 }
1240 1208
@@ -1265,7 +1233,6 @@ static void NetVscOnReceiveCompletion(void *Context)
1265 NetVscSendReceiveCompletion(device, transactionId); 1233 NetVscSendReceiveCompletion(device, transactionId);
1266 1234
1267 PutNetDevice(device); 1235 PutNetDevice(device);
1268 DPRINT_EXIT(NETVSC);
1269} 1236}
1270 1237
1271static void NetVscOnChannelCallback(void *Context) 1238static void NetVscOnChannelCallback(void *Context)
@@ -1292,7 +1259,6 @@ static void NetVscOnChannelCallback(void *Context)
1292 if (!netDevice) { 1259 if (!netDevice) {
1293 DPRINT_ERR(NETVSC, "net device (%p) shutting down..." 1260 DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
1294 "ignoring inbound packets", netDevice); 1261 "ignoring inbound packets", netDevice);
1295 DPRINT_EXIT(NETVSC);
1296 goto out; 1262 goto out;
1297 } 1263 }
1298 1264
@@ -1356,7 +1322,6 @@ static void NetVscOnChannelCallback(void *Context)
1356 } while (1); 1322 } while (1);
1357 1323
1358 PutNetDevice(device); 1324 PutNetDevice(device);
1359 DPRINT_EXIT(NETVSC);
1360out: 1325out:
1361 kfree(buffer); 1326 kfree(buffer);
1362 return; 1327 return;
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index c73fe95ad48..56e11575c97 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -90,7 +90,6 @@ static int netvsc_open(struct net_device *net)
90 DPRINT_ERR(NETVSC_DRV, "unable to open device...link is down."); 90 DPRINT_ERR(NETVSC_DRV, "unable to open device...link is down.");
91 } 91 }
92 92
93 DPRINT_EXIT(NETVSC_DRV);
94 return ret; 93 return ret;
95} 94}
96 95
@@ -106,8 +105,6 @@ static int netvsc_close(struct net_device *net)
106 if (ret != 0) 105 if (ret != 0)
107 DPRINT_ERR(NETVSC_DRV, "unable to close device (ret %d).", ret); 106 DPRINT_ERR(NETVSC_DRV, "unable to close device (ret %d).", ret);
108 107
109 DPRINT_EXIT(NETVSC_DRV);
110
111 return ret; 108 return ret;
112} 109}
113 110
@@ -129,8 +126,6 @@ static void netvsc_xmit_completion(void *context)
129 if ((net_device_ctx->avail += num_pages) >= PACKET_PAGES_HIWATER) 126 if ((net_device_ctx->avail += num_pages) >= PACKET_PAGES_HIWATER)
130 netif_wake_queue(net); 127 netif_wake_queue(net);
131 } 128 }
132
133 DPRINT_EXIT(NETVSC_DRV);
134} 129}
135 130
136static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) 131static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
@@ -217,7 +212,6 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
217 netvsc_xmit_completion(packet); 212 netvsc_xmit_completion(packet);
218 } 213 }
219 214
220 DPRINT_EXIT(NETVSC_DRV);
221 return NETDEV_TX_OK; 215 return NETDEV_TX_OK;
222} 216}
223 217
@@ -243,7 +237,6 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
243 netif_carrier_off(net); 237 netif_carrier_off(net);
244 netif_stop_queue(net); 238 netif_stop_queue(net);
245 } 239 }
246 DPRINT_EXIT(NETVSC_DRV);
247} 240}
248 241
249/* 242/*
@@ -311,8 +304,6 @@ static int netvsc_recv_callback(struct hv_device *device_obj,
311 DPRINT_DBG(NETVSC_DRV, "# of recvs %lu total size %lu", 304 DPRINT_DBG(NETVSC_DRV, "# of recvs %lu total size %lu",
312 net->stats.rx_packets, net->stats.rx_bytes); 305 net->stats.rx_packets, net->stats.rx_bytes);
313 306
314 DPRINT_EXIT(NETVSC_DRV);
315
316 return 0; 307 return 0;
317} 308}
318 309
@@ -408,7 +399,6 @@ static int netvsc_probe(struct device *device)
408 free_netdev(net); 399 free_netdev(net);
409 } 400 }
410 401
411 DPRINT_EXIT(NETVSC_DRV);
412 return ret; 402 return ret;
413} 403}
414 404
@@ -426,14 +416,11 @@ static int netvsc_remove(struct device *device)
426 416
427 if (net == NULL) { 417 if (net == NULL) {
428 DPRINT_INFO(NETVSC, "no net device to remove"); 418 DPRINT_INFO(NETVSC, "no net device to remove");
429 DPRINT_EXIT(NETVSC_DRV);
430 return 0; 419 return 0;
431 } 420 }
432 421
433 if (!net_drv_obj->Base.OnDeviceRemove) { 422 if (!net_drv_obj->Base.OnDeviceRemove)
434 DPRINT_EXIT(NETVSC_DRV);
435 return -1; 423 return -1;
436 }
437 424
438 /* Stop outbound asap */ 425 /* Stop outbound asap */
439 netif_stop_queue(net); 426 netif_stop_queue(net);
@@ -452,7 +439,6 @@ static int netvsc_remove(struct device *device)
452 } 439 }
453 440
454 free_netdev(net); 441 free_netdev(net);
455 DPRINT_EXIT(NETVSC_DRV);
456 return ret; 442 return ret;
457} 443}
458 444
@@ -497,8 +483,6 @@ static void netvsc_drv_exit(void)
497 483
498 vmbus_child_driver_unregister(drv_ctx); 484 vmbus_child_driver_unregister(drv_ctx);
499 485
500 DPRINT_EXIT(NETVSC_DRV);
501
502 return; 486 return;
503} 487}
504 488
@@ -527,8 +511,6 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
527 /* The driver belongs to vmbus */ 511 /* The driver belongs to vmbus */
528 ret = vmbus_child_driver_register(drv_ctx); 512 ret = vmbus_child_driver_register(drv_ctx);
529 513
530 DPRINT_EXIT(NETVSC_DRV);
531
532 return ret; 514 return ret;
533} 515}
534 516
@@ -548,24 +530,17 @@ MODULE_DEVICE_TABLE(dmi, hv_netvsc_dmi_table);
548 530
549static int __init netvsc_init(void) 531static int __init netvsc_init(void)
550{ 532{
551 int ret;
552
553 DPRINT_INFO(NETVSC_DRV, "Netvsc initializing...."); 533 DPRINT_INFO(NETVSC_DRV, "Netvsc initializing....");
554 534
555 if (!dmi_check_system(hv_netvsc_dmi_table)) 535 if (!dmi_check_system(hv_netvsc_dmi_table))
556 return -ENODEV; 536 return -ENODEV;
557 537
558 ret = netvsc_drv_init(NetVscInitialize); 538 return netvsc_drv_init(NetVscInitialize);
559
560 DPRINT_EXIT(NETVSC_DRV);
561
562 return ret;
563} 539}
564 540
565static void __exit netvsc_exit(void) 541static void __exit netvsc_exit(void)
566{ 542{
567 netvsc_drv_exit(); 543 netvsc_drv_exit();
568 DPRINT_EXIT(NETVSC_DRV);
569} 544}
570 545
571static const struct pci_device_id __initconst 546static const struct pci_device_id __initconst
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index bac8056fab2..66a497495d1 100644
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -380,9 +380,6 @@ int RingBufferWrite(RING_BUFFER_INFO *OutRingInfo,
380 byteAvailToWrite); 380 byteAvailToWrite);
381 381
382 spin_unlock_irqrestore(&OutRingInfo->ring_lock, flags); 382 spin_unlock_irqrestore(&OutRingInfo->ring_lock, flags);
383
384 DPRINT_EXIT(VMBUS);
385
386 return -1; 383 return -1;
387 } 384 }
388 385
@@ -414,9 +411,6 @@ int RingBufferWrite(RING_BUFFER_INFO *OutRingInfo,
414 /* DumpRingInfo(OutRingInfo, "AFTER "); */ 411 /* DumpRingInfo(OutRingInfo, "AFTER "); */
415 412
416 spin_unlock_irqrestore(&OutRingInfo->ring_lock, flags); 413 spin_unlock_irqrestore(&OutRingInfo->ring_lock, flags);
417
418 DPRINT_EXIT(VMBUS);
419
420 return 0; 414 return 0;
421} 415}
422 416
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index 6640682d36b..fa2141f454f 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -263,7 +263,6 @@ static int RndisFilterSendRequest(struct rndis_device *Device,
263 packet->Completion.Send.SendCompletionTid = (unsigned long)Device; 263 packet->Completion.Send.SendCompletionTid = (unsigned long)Device;
264 264
265 ret = gRndisFilter.InnerDriver.OnSend(Device->NetDevice->Device, packet); 265 ret = gRndisFilter.InnerDriver.OnSend(Device->NetDevice->Device, packet);
266 DPRINT_EXIT(NETVSC);
267 return ret; 266 return ret;
268} 267}
269 268
@@ -321,8 +320,6 @@ static void RndisFilterReceiveResponse(struct rndis_device *Device,
321 Response->Message.InitializeComplete.RequestId, 320 Response->Message.InitializeComplete.RequestId,
322 Response->NdisMessageType); 321 Response->NdisMessageType);
323 } 322 }
324
325 DPRINT_EXIT(NETVSC);
326} 323}
327 324
328static void RndisFilterReceiveIndicateStatus(struct rndis_device *Device, 325static void RndisFilterReceiveIndicateStatus(struct rndis_device *Device,
@@ -371,8 +368,6 @@ static void RndisFilterReceiveData(struct rndis_device *Device,
371 368
372 gRndisFilter.InnerDriver.OnReceiveCallback(Device->NetDevice->Device, 369 gRndisFilter.InnerDriver.OnReceiveCallback(Device->NetDevice->Device,
373 Packet); 370 Packet);
374
375 DPRINT_EXIT(NETVSC);
376} 371}
377 372
378static int RndisFilterOnReceive(struct hv_device *Device, 373static int RndisFilterOnReceive(struct hv_device *Device,
@@ -390,7 +385,6 @@ static int RndisFilterOnReceive(struct hv_device *Device,
390 if (!netDevice->Extension) { 385 if (!netDevice->Extension) {
391 DPRINT_ERR(NETVSC, "got rndis message but no rndis device..." 386 DPRINT_ERR(NETVSC, "got rndis message but no rndis device..."
392 "dropping this message!"); 387 "dropping this message!");
393 DPRINT_EXIT(NETVSC);
394 return -1; 388 return -1;
395 } 389 }
396 390
@@ -398,7 +392,6 @@ static int RndisFilterOnReceive(struct hv_device *Device,
398 if (rndisDevice->State == RNDIS_DEV_UNINITIALIZED) { 392 if (rndisDevice->State == RNDIS_DEV_UNINITIALIZED) {
399 DPRINT_ERR(NETVSC, "got rndis message but rndis device " 393 DPRINT_ERR(NETVSC, "got rndis message but rndis device "
400 "uninitialized...dropping this message!"); 394 "uninitialized...dropping this message!");
401 DPRINT_EXIT(NETVSC);
402 return -1; 395 return -1;
403 } 396 }
404 397
@@ -423,7 +416,6 @@ static int RndisFilterOnReceive(struct hv_device *Device,
423 "bytes got %u)...dropping this message!", 416 "bytes got %u)...dropping this message!",
424 rndisHeader->MessageLength, 417 rndisHeader->MessageLength,
425 Packet->TotalDataBufferLength); 418 Packet->TotalDataBufferLength);
426 DPRINT_EXIT(NETVSC);
427 return -1; 419 return -1;
428 } 420 }
429#endif 421#endif
@@ -471,7 +463,6 @@ static int RndisFilterOnReceive(struct hv_device *Device,
471 break; 463 break;
472 } 464 }
473 465
474 DPRINT_EXIT(NETVSC);
475 return 0; 466 return 0;
476} 467}
477 468
@@ -526,7 +517,6 @@ static int RndisFilterQueryDevice(struct rndis_device *Device, u32 Oid,
526Cleanup: 517Cleanup:
527 if (request) 518 if (request)
528 PutRndisRequest(Device, request); 519 PutRndisRequest(Device, request);
529 DPRINT_EXIT(NETVSC);
530 520
531 return ret; 521 return ret;
532} 522}
@@ -602,8 +592,6 @@ Cleanup:
602 if (request) 592 if (request)
603 PutRndisRequest(Device, request); 593 PutRndisRequest(Device, request);
604Exit: 594Exit:
605 DPRINT_EXIT(NETVSC);
606
607 return ret; 595 return ret;
608} 596}
609 597
@@ -644,8 +632,6 @@ int RndisFilterInit(struct netvsc_driver *Driver)
644 /* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */ 632 /* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */
645 Driver->OnReceiveCallback = RndisFilterOnReceive; 633 Driver->OnReceiveCallback = RndisFilterOnReceive;
646 634
647 DPRINT_EXIT(NETVSC);
648
649 return 0; 635 return 0;
650} 636}
651 637
@@ -694,7 +680,6 @@ static int RndisFilterInitDevice(struct rndis_device *Device)
694Cleanup: 680Cleanup:
695 if (request) 681 if (request)
696 PutRndisRequest(Device, request); 682 PutRndisRequest(Device, request);
697 DPRINT_EXIT(NETVSC);
698 683
699 return ret; 684 return ret;
700} 685}
@@ -722,7 +707,6 @@ static void RndisFilterHaltDevice(struct rndis_device *Device)
722Cleanup: 707Cleanup:
723 if (request) 708 if (request)
724 PutRndisRequest(Device, request); 709 PutRndisRequest(Device, request);
725 DPRINT_EXIT(NETVSC);
726 return; 710 return;
727} 711}
728 712
@@ -740,7 +724,6 @@ static int RndisFilterOpenDevice(struct rndis_device *Device)
740 if (ret == 0) 724 if (ret == 0)
741 Device->State = RNDIS_DEV_DATAINITIALIZED; 725 Device->State = RNDIS_DEV_DATAINITIALIZED;
742 726
743 DPRINT_EXIT(NETVSC);
744 return ret; 727 return ret;
745} 728}
746 729
@@ -755,8 +738,6 @@ static int RndisFilterCloseDevice(struct rndis_device *Device)
755 if (ret == 0) 738 if (ret == 0)
756 Device->State = RNDIS_DEV_INITIALIZED; 739 Device->State = RNDIS_DEV_INITIALIZED;
757 740
758 DPRINT_EXIT(NETVSC);
759
760 return ret; 741 return ret;
761} 742}
762 743
@@ -769,10 +750,8 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
769 struct netvsc_device_info *deviceInfo = AdditionalInfo; 750 struct netvsc_device_info *deviceInfo = AdditionalInfo;
770 751
771 rndisDevice = GetRndisDevice(); 752 rndisDevice = GetRndisDevice();
772 if (!rndisDevice) { 753 if (!rndisDevice)
773 DPRINT_EXIT(NETVSC);
774 return -1; 754 return -1;
775 }
776 755
777 DPRINT_DBG(NETVSC, "rndis device object allocated - %p", rndisDevice); 756 DPRINT_DBG(NETVSC, "rndis device object allocated - %p", rndisDevice);
778 757
@@ -784,7 +763,6 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
784 ret = gRndisFilter.InnerDriver.Base.OnDeviceAdd(Device, AdditionalInfo); 763 ret = gRndisFilter.InnerDriver.Base.OnDeviceAdd(Device, AdditionalInfo);
785 if (ret != 0) { 764 if (ret != 0) {
786 kfree(rndisDevice); 765 kfree(rndisDevice);
787 DPRINT_EXIT(NETVSC);
788 return ret; 766 return ret;
789 } 767 }
790 768
@@ -825,8 +803,6 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,
825 DPRINT_INFO(NETVSC, "Device 0x%p link state %s", rndisDevice, 803 DPRINT_INFO(NETVSC, "Device 0x%p link state %s", rndisDevice,
826 ((deviceInfo->LinkState) ? ("down") : ("up"))); 804 ((deviceInfo->LinkState) ? ("down") : ("up")));
827 805
828 DPRINT_EXIT(NETVSC);
829
830 return ret; 806 return ret;
831} 807}
832 808
@@ -844,44 +820,31 @@ static int RndisFilterOnDeviceRemove(struct hv_device *Device)
844 /* Pass control to inner driver to remove the device */ 820 /* Pass control to inner driver to remove the device */
845 gRndisFilter.InnerDriver.Base.OnDeviceRemove(Device); 821 gRndisFilter.InnerDriver.Base.OnDeviceRemove(Device);
846 822
847 DPRINT_EXIT(NETVSC);
848
849 return 0; 823 return 0;
850} 824}
851 825
852static void RndisFilterOnCleanup(struct hv_driver *Driver) 826static void RndisFilterOnCleanup(struct hv_driver *Driver)
853{ 827{
854 DPRINT_EXIT(NETVSC);
855} 828}
856 829
857int RndisFilterOnOpen(struct hv_device *Device) 830int RndisFilterOnOpen(struct hv_device *Device)
858{ 831{
859 int ret;
860 struct netvsc_device *netDevice = Device->Extension; 832 struct netvsc_device *netDevice = Device->Extension;
861 833
862 if (!netDevice) 834 if (!netDevice)
863 return -EINVAL; 835 return -EINVAL;
864 836
865 ret = RndisFilterOpenDevice(netDevice->Extension); 837 return RndisFilterOpenDevice(netDevice->Extension);
866
867 DPRINT_EXIT(NETVSC);
868
869 return ret;
870} 838}
871 839
872int RndisFilterOnClose(struct hv_device *Device) 840int RndisFilterOnClose(struct hv_device *Device)
873{ 841{
874 int ret;
875 struct netvsc_device *netDevice = Device->Extension; 842 struct netvsc_device *netDevice = Device->Extension;
876 843
877 if (!netDevice) 844 if (!netDevice)
878 return -EINVAL; 845 return -EINVAL;
879 846
880 ret = RndisFilterCloseDevice(netDevice->Extension); 847 return RndisFilterCloseDevice(netDevice->Extension);
881
882 DPRINT_EXIT(NETVSC);
883
884 return ret;
885} 848}
886 849
887static int RndisFilterOnSend(struct hv_device *Device, 850static int RndisFilterOnSend(struct hv_device *Device,
@@ -937,8 +900,6 @@ static int RndisFilterOnSend(struct hv_device *Device,
937 filterPacket->CompletionContext; 900 filterPacket->CompletionContext;
938 } 901 }
939 902
940 DPRINT_EXIT(NETVSC);
941
942 return ret; 903 return ret;
943} 904}
944 905
@@ -948,13 +909,10 @@ static void RndisFilterOnSendCompletion(void *Context)
948 909
949 /* Pass it back to the original handler */ 910 /* Pass it back to the original handler */
950 filterPacket->OnCompletion(filterPacket->CompletionContext); 911 filterPacket->OnCompletion(filterPacket->CompletionContext);
951
952 DPRINT_EXIT(NETVSC);
953} 912}
954 913
955 914
956static void RndisFilterOnSendRequestCompletion(void *Context) 915static void RndisFilterOnSendRequestCompletion(void *Context)
957{ 916{
958 /* Noop */ 917 /* Noop */
959 DPRINT_EXIT(NETVSC);
960} 918}
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 7a206858cb1..6bd2ff138d2 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -186,7 +186,6 @@ static int StorVscChannelInit(struct hv_device *Device)
186 if (!storDevice) { 186 if (!storDevice) {
187 DPRINT_ERR(STORVSC, "unable to get stor device..." 187 DPRINT_ERR(STORVSC, "unable to get stor device..."
188 "device being destroyed?"); 188 "device being destroyed?");
189 DPRINT_EXIT(STORVSC);
190 return -1; 189 return -1;
191 } 190 }
192 191
@@ -344,8 +343,6 @@ Cleanup:
344 request->WaitEvent = NULL; 343 request->WaitEvent = NULL;
345nomem: 344nomem:
346 PutStorDevice(Device); 345 PutStorDevice(Device);
347
348 DPRINT_EXIT(STORVSC);
349 return ret; 346 return ret;
350} 347}
351 348
@@ -360,7 +357,6 @@ static void StorVscOnIOCompletion(struct hv_device *Device,
360 if (!storDevice) { 357 if (!storDevice) {
361 DPRINT_ERR(STORVSC, "unable to get stor device..." 358 DPRINT_ERR(STORVSC, "unable to get stor device..."
362 "device being destroyed?"); 359 "device being destroyed?");
363 DPRINT_EXIT(STORVSC);
364 return; 360 return;
365 } 361 }
366 362
@@ -412,8 +408,6 @@ static void StorVscOnIOCompletion(struct hv_device *Device,
412 atomic_dec(&storDevice->NumOutstandingRequests); 408 atomic_dec(&storDevice->NumOutstandingRequests);
413 409
414 PutStorDevice(Device); 410 PutStorDevice(Device);
415
416 DPRINT_EXIT(STORVSC);
417} 411}
418 412
419static void StorVscOnReceive(struct hv_device *Device, 413static void StorVscOnReceive(struct hv_device *Device,
@@ -453,7 +447,6 @@ static void StorVscOnChannelCallback(void *context)
453 if (!storDevice) { 447 if (!storDevice) {
454 DPRINT_ERR(STORVSC, "unable to get stor device..." 448 DPRINT_ERR(STORVSC, "unable to get stor device..."
455 "device being destroyed?"); 449 "device being destroyed?");
456 DPRINT_EXIT(STORVSC);
457 return; 450 return;
458 } 451 }
459 452
@@ -497,8 +490,6 @@ static void StorVscOnChannelCallback(void *context)
497 } while (1); 490 } while (1);
498 491
499 PutStorDevice(device); 492 PutStorDevice(device);
500
501 DPRINT_EXIT(STORVSC);
502 return; 493 return;
503} 494}
504 495
@@ -578,8 +569,6 @@ static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
578 storDevice->TargetId); 569 storDevice->TargetId);
579 570
580Cleanup: 571Cleanup:
581 DPRINT_EXIT(STORVSC);
582
583 return ret; 572 return ret;
584} 573}
585 574
@@ -617,8 +606,6 @@ static int StorVscOnDeviceRemove(struct hv_device *Device)
617 Device->Driver->VmbusChannelInterface.Close(Device); 606 Device->Driver->VmbusChannelInterface.Close(Device);
618 607
619 FreeStorDevice(storDevice); 608 FreeStorDevice(storDevice);
620
621 DPRINT_EXIT(STORVSC);
622 return 0; 609 return 0;
623} 610}
624 611
@@ -635,7 +622,6 @@ int StorVscOnHostReset(struct hv_device *Device)
635 if (!storDevice) { 622 if (!storDevice) {
636 DPRINT_ERR(STORVSC, "unable to get stor device..." 623 DPRINT_ERR(STORVSC, "unable to get stor device..."
637 "device being destroyed?"); 624 "device being destroyed?");
638 DPRINT_EXIT(STORVSC);
639 return -1; 625 return -1;
640 } 626 }
641 627
@@ -677,7 +663,6 @@ int StorVscOnHostReset(struct hv_device *Device)
677 663
678Cleanup: 664Cleanup:
679 PutStorDevice(Device); 665 PutStorDevice(Device);
680 DPRINT_EXIT(STORVSC);
681 return ret; 666 return ret;
682} 667}
683 668
@@ -708,7 +693,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
708 if (!storDevice) { 693 if (!storDevice) {
709 DPRINT_ERR(STORVSC, "unable to get stor device..." 694 DPRINT_ERR(STORVSC, "unable to get stor device..."
710 "device being destroyed?"); 695 "device being destroyed?");
711 DPRINT_EXIT(STORVSC);
712 return -2; 696 return -2;
713 } 697 }
714 698
@@ -774,8 +758,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
774 atomic_inc(&storDevice->NumOutstandingRequests); 758 atomic_inc(&storDevice->NumOutstandingRequests);
775 759
776 PutStorDevice(Device); 760 PutStorDevice(Device);
777
778 DPRINT_EXIT(STORVSC);
779 return ret; 761 return ret;
780} 762}
781 763
@@ -784,7 +766,6 @@ static int StorVscOnIORequest(struct hv_device *Device,
784 */ 766 */
785static void StorVscOnCleanup(struct hv_driver *Driver) 767static void StorVscOnCleanup(struct hv_driver *Driver)
786{ 768{
787 DPRINT_EXIT(STORVSC);
788} 769}
789 770
790/* 771/*
@@ -837,7 +818,5 @@ int StorVscInitialize(struct hv_driver *Driver)
837 818
838 storDriver->OnIORequest = StorVscOnIORequest; 819 storDriver->OnIORequest = StorVscOnIORequest;
839 820
840 DPRINT_EXIT(STORVSC);
841
842 return 0; 821 return 0;
843} 822}
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 16d468529cd..075b61bd492 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -173,8 +173,6 @@ static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
173 /* The driver belongs to vmbus */ 173 /* The driver belongs to vmbus */
174 ret = vmbus_child_driver_register(drv_ctx); 174 ret = vmbus_child_driver_register(drv_ctx);
175 175
176 DPRINT_EXIT(STORVSC_DRV);
177
178 return ret; 176 return ret;
179} 177}
180 178
@@ -215,9 +213,6 @@ static void storvsc_drv_exit(void)
215 storvsc_drv_obj->Base.OnCleanup(&storvsc_drv_obj->Base); 213 storvsc_drv_obj->Base.OnCleanup(&storvsc_drv_obj->Base);
216 214
217 vmbus_child_driver_unregister(drv_ctx); 215 vmbus_child_driver_unregister(drv_ctx);
218
219 DPRINT_EXIT(STORVSC_DRV);
220
221 return; 216 return;
222} 217}
223 218
@@ -265,8 +260,6 @@ static int storvsc_probe(struct device *device)
265 260
266 if (!host_device_ctx->request_pool) { 261 if (!host_device_ctx->request_pool) {
267 scsi_host_put(host); 262 scsi_host_put(host);
268 DPRINT_EXIT(STORVSC_DRV);
269
270 return -ENOMEM; 263 return -ENOMEM;
271 } 264 }
272 265
@@ -278,8 +271,6 @@ static int storvsc_probe(struct device *device)
278 DPRINT_ERR(STORVSC_DRV, "unable to add scsi vsc device"); 271 DPRINT_ERR(STORVSC_DRV, "unable to add scsi vsc device");
279 kmem_cache_destroy(host_device_ctx->request_pool); 272 kmem_cache_destroy(host_device_ctx->request_pool);
280 scsi_host_put(host); 273 scsi_host_put(host);
281 DPRINT_EXIT(STORVSC_DRV);
282
283 return -1; 274 return -1;
284 } 275 }
285 276
@@ -303,15 +294,10 @@ static int storvsc_probe(struct device *device)
303 294
304 kmem_cache_destroy(host_device_ctx->request_pool); 295 kmem_cache_destroy(host_device_ctx->request_pool);
305 scsi_host_put(host); 296 scsi_host_put(host);
306 DPRINT_EXIT(STORVSC_DRV);
307
308 return -1; 297 return -1;
309 } 298 }
310 299
311 scsi_scan_host(host); 300 scsi_scan_host(host);
312
313 DPRINT_EXIT(STORVSC_DRV);
314
315 return ret; 301 return ret;
316} 302}
317 303
@@ -334,10 +320,8 @@ static int storvsc_remove(struct device *device)
334 (struct host_device_context *)host->hostdata; 320 (struct host_device_context *)host->hostdata;
335 321
336 322
337 if (!storvsc_drv_obj->Base.OnDeviceRemove) { 323 if (!storvsc_drv_obj->Base.OnDeviceRemove)
338 DPRINT_EXIT(STORVSC_DRV);
339 return -1; 324 return -1;
340 }
341 325
342 /* 326 /*
343 * Call to the vsc driver to let it know that the device is being 327 * Call to the vsc driver to let it know that the device is being
@@ -360,9 +344,6 @@ static int storvsc_remove(struct device *device)
360 344
361 DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host); 345 DPRINT_INFO(STORVSC, "releasing host adapter (%p)...", host);
362 scsi_host_put(host); 346 scsi_host_put(host);
363
364 DPRINT_EXIT(STORVSC_DRV);
365
366 return ret; 347 return ret;
367} 348}
368 349
@@ -417,8 +398,6 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)
417 scsi_done_fn(scmnd); 398 scsi_done_fn(scmnd);
418 399
419 kmem_cache_free(host_device_ctx->request_pool, cmd_request); 400 kmem_cache_free(host_device_ctx->request_pool, cmd_request);
420
421 DPRINT_EXIT(STORVSC_DRV);
422} 401}
423 402
424static int do_bounce_buffer(struct scatterlist *sgl, unsigned int sg_count) 403static int do_bounce_buffer(struct scatterlist *sgl, unsigned int sg_count)
@@ -800,8 +779,6 @@ retry_request:
800 ret = SCSI_MLQUEUE_DEVICE_BUSY; 779 ret = SCSI_MLQUEUE_DEVICE_BUSY;
801 } 780 }
802 781
803 DPRINT_EXIT(STORVSC_DRV);
804
805 return ret; 782 return ret;
806} 783}
807 784
@@ -866,16 +843,12 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
866 843
867 /* Invokes the vsc to reset the host/bus */ 844 /* Invokes the vsc to reset the host/bus */
868 ret = StorVscOnHostReset(&device_ctx->device_obj); 845 ret = StorVscOnHostReset(&device_ctx->device_obj);
869 if (ret != 0) { 846 if (ret != 0)
870 DPRINT_EXIT(STORVSC_DRV);
871 return ret; 847 return ret;
872 }
873 848
874 DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted", 849 DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted",
875 scmnd->device, &device_ctx->device_obj); 850 scmnd->device, &device_ctx->device_obj);
876 851
877 DPRINT_EXIT(STORVSC_DRV);
878
879 return ret; 852 return ret;
880} 853}
881 854
@@ -965,7 +938,6 @@ static int __init storvsc_init(void)
965 938
966 DPRINT_INFO(STORVSC_DRV, "Storvsc initializing...."); 939 DPRINT_INFO(STORVSC_DRV, "Storvsc initializing....");
967 ret = storvsc_drv_init(StorVscInitialize); 940 ret = storvsc_drv_init(StorVscInitialize);
968 DPRINT_EXIT(STORVSC_DRV);
969 return ret; 941 return ret;
970} 942}
971 943
diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index f389c3c290f..ca1e18a6200 100644
--- a/drivers/staging/hv/vmbus.c
+++ b/drivers/staging/hv/vmbus.c
@@ -58,7 +58,6 @@ static struct hv_device *gDevice; /* vmbus root device */
58static void VmbusGetChannelOffers(void) 58static void VmbusGetChannelOffers(void)
59{ 59{
60 VmbusChannelRequestOffers(); 60 VmbusChannelRequestOffers();
61 DPRINT_EXIT(VMBUS);
62} 61}
63 62
64/* 63/*
@@ -133,8 +132,6 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
133 ret = VmbusConnect(); 132 ret = VmbusConnect();
134 133
135 /* VmbusSendEvent(device->localPortId+1); */ 134 /* VmbusSendEvent(device->localPortId+1); */
136 DPRINT_EXIT(VMBUS);
137
138 return ret; 135 return ret;
139} 136}
140 137
@@ -148,8 +145,6 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
148 VmbusChannelReleaseUnattachedChannels(); 145 VmbusChannelReleaseUnattachedChannels();
149 VmbusDisconnect(); 146 VmbusDisconnect();
150 on_each_cpu(HvSynicCleanup, NULL, 1); 147 on_each_cpu(HvSynicCleanup, NULL, 1);
151 DPRINT_EXIT(VMBUS);
152
153 return ret; 148 return ret;
154} 149}
155 150
@@ -161,7 +156,6 @@ static void VmbusOnCleanup(struct hv_driver *drv)
161 /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */ 156 /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */
162 157
163 HvCleanup(); 158 HvCleanup();
164 DPRINT_EXIT(VMBUS);
165} 159}
166 160
167/* 161/*
@@ -252,7 +246,6 @@ static int VmbusOnISR(struct hv_driver *drv)
252 ret |= 0x2; 246 ret |= 0x2;
253 } 247 }
254 248
255 DPRINT_EXIT(VMBUS);
256 return ret; 249 return ret;
257} 250}
258 251
@@ -296,7 +289,5 @@ int VmbusInitialize(struct hv_driver *drv)
296 ret); 289 ret);
297 gDriver = drv; 290 gDriver = drv;
298 291
299 DPRINT_EXIT(VMBUS);
300
301 return ret; 292 return ret;
302} 293}
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 13003fcf2e2..63c9168504e 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -355,8 +355,6 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
355 vmbus_drv_obj->GetChannelOffers(); 355 vmbus_drv_obj->GetChannelOffers();
356 356
357cleanup: 357cleanup:
358 DPRINT_EXIT(VMBUS_DRV);
359
360 return ret; 358 return ret;
361} 359}
362 360
@@ -388,10 +386,6 @@ static void vmbus_bus_exit(void)
388 386
389 tasklet_kill(&vmbus_drv_ctx->msg_dpc); 387 tasklet_kill(&vmbus_drv_ctx->msg_dpc);
390 tasklet_kill(&vmbus_drv_ctx->event_dpc); 388 tasklet_kill(&vmbus_drv_ctx->event_dpc);
391
392 DPRINT_EXIT(VMBUS_DRV);
393
394 return;
395} 389}
396 390
397 391
@@ -422,8 +416,6 @@ int vmbus_child_driver_register(struct driver_context *driver_ctx)
422 416
423 vmbus_drv_obj->GetChannelOffers(); 417 vmbus_drv_obj->GetChannelOffers();
424 418
425 DPRINT_EXIT(VMBUS_DRV);
426
427 return ret; 419 return ret;
428} 420}
429EXPORT_SYMBOL(vmbus_child_driver_register); 421EXPORT_SYMBOL(vmbus_child_driver_register);
@@ -447,8 +439,6 @@ void vmbus_child_driver_unregister(struct driver_context *driver_ctx)
447 driver_unregister(&driver_ctx->driver); 439 driver_unregister(&driver_ctx->driver);
448 440
449 driver_ctx->driver.bus = NULL; 441 driver_ctx->driver.bus = NULL;
450
451 DPRINT_EXIT(VMBUS_DRV);
452} 442}
453EXPORT_SYMBOL(vmbus_child_driver_unregister); 443EXPORT_SYMBOL(vmbus_child_driver_unregister);
454 444
@@ -500,8 +490,6 @@ static struct hv_device *vmbus_child_device_create(struct hv_guid *type,
500 if (!child_device_ctx) { 490 if (!child_device_ctx) {
501 DPRINT_ERR(VMBUS_DRV, 491 DPRINT_ERR(VMBUS_DRV,
502 "unable to allocate device_context for child device"); 492 "unable to allocate device_context for child device");
503 DPRINT_EXIT(VMBUS_DRV);
504
505 return NULL; 493 return NULL;
506 } 494 }
507 495
@@ -533,8 +521,6 @@ static struct hv_device *vmbus_child_device_create(struct hv_guid *type,
533 memcpy(&child_device_ctx->class_id, type, sizeof(struct hv_guid)); 521 memcpy(&child_device_ctx->class_id, type, sizeof(struct hv_guid));
534 memcpy(&child_device_ctx->device_id, instance, sizeof(struct hv_guid)); 522 memcpy(&child_device_ctx->device_id, instance, sizeof(struct hv_guid));
535 523
536 DPRINT_EXIT(VMBUS_DRV);
537
538 return child_device_obj; 524 return child_device_obj;
539} 525}
540 526
@@ -579,8 +565,6 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
579 DPRINT_INFO(VMBUS_DRV, "child device (%p) registered", 565 DPRINT_INFO(VMBUS_DRV, "child device (%p) registered",
580 &child_device_ctx->device); 566 &child_device_ctx->device);
581 567
582 DPRINT_EXIT(VMBUS_DRV);
583
584 return ret; 568 return ret;
585} 569}
586 570
@@ -603,8 +587,6 @@ static void vmbus_child_device_unregister(struct hv_device *device_obj)
603 587
604 DPRINT_INFO(VMBUS_DRV, "child device (%p) unregistered", 588 DPRINT_INFO(VMBUS_DRV, "child device (%p) unregistered",
605 &device_ctx->device); 589 &device_ctx->device);
606
607 DPRINT_EXIT(VMBUS_DRV);
608} 590}
609 591
610/* 592/*
@@ -612,7 +594,6 @@ static void vmbus_child_device_unregister(struct hv_device *device_obj)
612 */ 594 */
613static void vmbus_child_device_destroy(struct hv_device *device_obj) 595static void vmbus_child_device_destroy(struct hv_device *device_obj)
614{ 596{
615 DPRINT_EXIT(VMBUS_DRV);
616} 597}
617 598
618/* 599/*
@@ -687,8 +668,6 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
687 if (ret) 668 if (ret)
688 return ret; 669 return ret;
689 670
690 DPRINT_EXIT(VMBUS_DRV);
691
692 return 0; 671 return 0;
693} 672}
694 673
@@ -719,9 +698,6 @@ static int vmbus_match(struct device *device, struct device_driver *driver)
719 698
720 match = 1; 699 match = 1;
721 } 700 }
722
723 DPRINT_EXIT(VMBUS_DRV);
724
725 return match; 701 return match;
726} 702}
727 703
@@ -743,7 +719,6 @@ static void vmbus_probe_failed_cb(struct work_struct *context)
743 device_unregister(&device_ctx->device); 719 device_unregister(&device_ctx->device);
744 720
745 /* put_device(&device_ctx->device); */ 721 /* put_device(&device_ctx->device); */
746 DPRINT_EXIT(VMBUS_DRV);
747} 722}
748 723
749/* 724/*
@@ -775,8 +750,6 @@ static int vmbus_probe(struct device *child_device)
775 child_device->driver->name); 750 child_device->driver->name);
776 ret = -1; 751 ret = -1;
777 } 752 }
778
779 DPRINT_EXIT(VMBUS_DRV);
780 return ret; 753 return ret;
781} 754}
782 755
@@ -794,7 +767,6 @@ static int vmbus_remove(struct device *child_device)
794 * No-op since it is statically defined and handle in 767 * No-op since it is statically defined and handle in
795 * vmbus_bus_exit() 768 * vmbus_bus_exit()
796 */ 769 */
797 DPRINT_EXIT(VMBUS_DRV);
798 return 0; 770 return 0;
799 } 771 }
800 772
@@ -815,8 +787,6 @@ static int vmbus_remove(struct device *child_device)
815 } 787 }
816 } 788 }
817 789
818 DPRINT_EXIT(VMBUS_DRV);
819
820 return 0; 790 return 0;
821} 791}
822 792
@@ -833,15 +803,12 @@ static void vmbus_shutdown(struct device *child_device)
833 * No-op since it is statically defined and handle in 803 * No-op since it is statically defined and handle in
834 * vmbus_bus_exit() 804 * vmbus_bus_exit()
835 */ 805 */
836 DPRINT_EXIT(VMBUS_DRV);
837 return; 806 return;
838 } 807 }
839 808
840 /* The device may not be attached yet */ 809 /* The device may not be attached yet */
841 if (!child_device->driver) { 810 if (!child_device->driver)
842 DPRINT_EXIT(VMBUS_DRV);
843 return; 811 return;
844 }
845 812
846 driver_ctx = driver_to_driver_context(child_device->driver); 813 driver_ctx = driver_to_driver_context(child_device->driver);
847 814
@@ -849,8 +816,6 @@ static void vmbus_shutdown(struct device *child_device)
849 if (driver_ctx->shutdown) 816 if (driver_ctx->shutdown)
850 driver_ctx->shutdown(child_device); 817 driver_ctx->shutdown(child_device);
851 818
852 DPRINT_EXIT(VMBUS_DRV);
853
854 return; 819 return;
855} 820}
856 821
@@ -864,7 +829,6 @@ static void vmbus_bus_release(struct device *device)
864 * of a problem design, this MUST BE FIXED! */ 829 * of a problem design, this MUST BE FIXED! */
865 dev_err(device, "%s needs to be fixed!\n", __func__); 830 dev_err(device, "%s needs to be fixed!\n", __func__);
866 WARN_ON(1); 831 WARN_ON(1);
867 DPRINT_EXIT(VMBUS_DRV);
868} 832}
869 833
870/* 834/*
@@ -878,9 +842,6 @@ static void vmbus_device_release(struct device *device)
878 kfree(device_ctx); 842 kfree(device_ctx);
879 843
880 /* !!DO NOT REFERENCE device_ctx anymore at this point!! */ 844 /* !!DO NOT REFERENCE device_ctx anymore at this point!! */
881 DPRINT_EXIT(VMBUS_DRV);
882
883 return;
884} 845}
885 846
886/* 847/*
@@ -894,8 +855,6 @@ static void vmbus_msg_dpc(unsigned long data)
894 855
895 /* Call to bus driver to handle interrupt */ 856 /* Call to bus driver to handle interrupt */
896 vmbus_drv_obj->OnMsgDpc(&vmbus_drv_obj->Base); 857 vmbus_drv_obj->OnMsgDpc(&vmbus_drv_obj->Base);
897
898 DPRINT_EXIT(VMBUS_DRV);
899} 858}
900 859
901/* 860/*
@@ -909,8 +868,6 @@ static void vmbus_event_dpc(unsigned long data)
909 868
910 /* Call to bus driver to handle interrupt */ 869 /* Call to bus driver to handle interrupt */
911 vmbus_drv_obj->OnEventDpc(&vmbus_drv_obj->Base); 870 vmbus_drv_obj->OnEventDpc(&vmbus_drv_obj->Base);
912
913 DPRINT_EXIT(VMBUS_DRV);
914} 871}
915 872
916static irqreturn_t vmbus_isr(int irq, void *dev_id) 873static irqreturn_t vmbus_isr(int irq, void *dev_id)
@@ -931,10 +888,8 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
931 if (test_bit(1, (unsigned long *)&ret)) 888 if (test_bit(1, (unsigned long *)&ret))
932 tasklet_schedule(&g_vmbus_drv.event_dpc); 889 tasklet_schedule(&g_vmbus_drv.event_dpc);
933 890
934 DPRINT_EXIT(VMBUS_DRV);
935 return IRQ_HANDLED; 891 return IRQ_HANDLED;
936 } else { 892 } else {
937 DPRINT_EXIT(VMBUS_DRV);
938 return IRQ_NONE; 893 return IRQ_NONE;
939 } 894 }
940} 895}
@@ -954,8 +909,6 @@ MODULE_DEVICE_TABLE(dmi, microsoft_hv_dmi_table);
954 909
955static int __init vmbus_init(void) 910static int __init vmbus_init(void)
956{ 911{
957 int ret = 0;
958
959 DPRINT_INFO(VMBUS_DRV, 912 DPRINT_INFO(VMBUS_DRV,
960 "Vmbus initializing.... current log level 0x%x (%x,%x)", 913 "Vmbus initializing.... current log level 0x%x (%x,%x)",
961 vmbus_loglevel, HIWORD(vmbus_loglevel), LOWORD(vmbus_loglevel)); 914 vmbus_loglevel, HIWORD(vmbus_loglevel), LOWORD(vmbus_loglevel));
@@ -964,18 +917,13 @@ static int __init vmbus_init(void)
964 if (!dmi_check_system(microsoft_hv_dmi_table)) 917 if (!dmi_check_system(microsoft_hv_dmi_table))
965 return -ENODEV; 918 return -ENODEV;
966 919
967 ret = vmbus_bus_init(VmbusInitialize); 920 return vmbus_bus_init(VmbusInitialize);
968
969 DPRINT_EXIT(VMBUS_DRV);
970 return ret;
971} 921}
972 922
973static void __exit vmbus_exit(void) 923static void __exit vmbus_exit(void)
974{ 924{
975 vmbus_bus_exit(); 925 vmbus_bus_exit();
976 /* Todo: it is used for loglevel, to be ported to new kernel. */ 926 /* Todo: it is used for loglevel, to be ported to new kernel. */
977 DPRINT_EXIT(VMBUS_DRV);
978 return;
979} 927}
980 928
981/* 929/*
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-21 21:30:25 -0400