Update all the code to consume the ConvertDevicePathToText, ConvertDevicePathNodeToTe...

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciBusDxe / PciLib.c

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index a5cea9e52a0d2b590569c7dc63cfd275f505c0c4..b3d91a8d3037ee43f85f060211d78a3d27567c9e 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
@@ -290,7 +290,6 @@ DumpResourceMap (
   PCI_RESOURCE_NODE                *ChildPMem32Node;\r
   PCI_RESOURCE_NODE                *ChildMem64Node;\r
   PCI_RESOURCE_NODE                *ChildPMem64Node;\r
   PCI_RESOURCE_NODE                *ChildPMem32Node;\r
   PCI_RESOURCE_NODE                *ChildMem64Node;\r
   PCI_RESOURCE_NODE                *ChildPMem64Node;\r

-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *ToText;\r

   CHAR16                           *Str;\r
 \r
   DEBUG ((EFI_D_INFO, "PciBus: Resource Map for "));\r
   CHAR16                           *Str;\r
 \r
   DEBUG ((EFI_D_INFO, "PciBus: Resource Map for "));\r


@@ -309,19 +308,11 @@ DumpResourceMap (
       Bridge->BusNumber, Bridge->DeviceNumber, Bridge->FunctionNumber\r
       ));\r
   } else {\r
       Bridge->BusNumber, Bridge->DeviceNumber, Bridge->FunctionNumber\r
       ));\r
   } else {\r

-    Status = gBS->LocateProtocol (\r
-                    &gEfiDevicePathToTextProtocolGuid,\r
-                    NULL,\r
-                    (VOID **) &ToText\r
-                    );\r
-    Str = NULL;\r
-    if (!EFI_ERROR (Status)) {\r
-      Str = ToText->ConvertDevicePathToText (\r
-                      DevicePathFromHandle (Bridge->Handle),\r
-                      FALSE,\r
-                      FALSE\r
-                      );\r
-    }\r
+    Str = ConvertDevicePathToText (\r
+            DevicePathFromHandle (Bridge->Handle),\r
+            FALSE,\r
+            FALSE\r
+            );\r

     DEBUG ((EFI_D_INFO, "Root Bridge %s\n", Str != NULL ? Str : L""));\r
     if (Str != NULL) {\r
       FreePool (Str);\r
     DEBUG ((EFI_D_INFO, "Root Bridge %s\n", Str != NULL ? Str : L""));\r
     if (Str != NULL) {\r
       FreePool (Str);\r