6 files changed, 2 insertions, 25 deletions
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 2e3edfd831..0eaa9cce5d 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1271,8 +1271,6 @@ EhcAsyncIsochronousTransfer (
   return EFI_UNSUPPORTED;
 }
 
-//@MT: EFI_DRIVER_ENTRY_POINT (EhcDriverEntryPoint)
-
 EFI_STATUS
 EFIAPI
 EhcDriverEntryPoint (
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 8cda00fbda..28d9b63d9d 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -1828,8 +1828,6 @@ Uhci2AsyncIsochronousTransfer (
   return EFI_UNSUPPORTED;
 }
 
-//@MT: EFI_DRIVER_ENTRY_POINT (UhciDriverEntryPoint)
-
 EFI_STATUS
 EFIAPI
 UhciDriverEntryPoint (
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
index f551c0a93b..55cf88c0cc 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
@@ -113,8 +113,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUsbKeyboardDriverBinding = {
   NULL
 };
 
-//@MT: EFI_DRIVER_ENTRY_POINT (USBKeyboardDriverBindingEntryPoint)
-
 EFI_STATUS
 EFIAPI
 USBKeyboardDriverBindingEntryPoint (
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index 33c3755c97..bae04a2361 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
@@ -594,8 +594,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUSBMassDriverBinding = {
   NULL
 };
 
-//@MT: EFI_DRIVER_ENTRY_POINT (USBMassStorageEntryPoint)
-
 EFI_STATUS
 EFIAPI
 USBMassStorageEntryPoint (
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
index 446e8eb443..4d9aed937d 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
@@ -24,19 +24,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/Usb.h>
 
 
-//
-// Driver Consumed Protocol Prototypes
-//
-//@MT:#include EFI_PROTOCOL_DEFINITION (DriverBinding)
-//@MT:#include EFI_PROTOCOL_DEFINITION (UsbIo)
-
-//
-// Driver Produced Protocol Prototypes
-//
-//@MT:#include EFI_PROTOCOL_DEFINITION (SimplePointer)
-
-//@MT:#include "UsbDxeLib.h"
-//@MT:#include "hid.h"
 #include "usbmouse.h"
 #include "mousehid.h"
 
@@ -147,8 +134,6 @@ UsbMouseReset (
 //
 // Driver start here
 //
-//@MT: EFI_DRIVER_ENTRY_POINT (USBMouseDriverBindingEntryPoint)
-
 EFI_STATUS
 EFIAPI
 USBMouseDriverBindingEntryPoint (
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/receive.c b/MdeModulePkg/Universal/Network/SnpDxe/receive.c
index 64ca2565d9..58bfa34f90 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/receive.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/receive.c
@@ -115,7 +115,7 @@ pxe_receive (
   //
   // Issue UNDI command and check result.
   //
-  DEBUG ((EFI_D_INFO, "\nsnp->undi.receive ()  "));
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive ()  "));
 
   (*snp->issue_undi32_command) ((UINT64)(UINTN) &snp->cdb);
 
@@ -125,7 +125,7 @@ pxe_receive (
 
   case PXE_STATCODE_NO_DATA:
     DEBUG (
-      (EFI_D_INFO,
+      (EFI_D_NET,
       "\nsnp->undi.receive ()  %xh:%xh\n",
       snp->cdb.StatFlags,
       snp->cdb.StatCode)