From 863986b3c8e67736d361b68e293d01e6f92f825c Mon Sep 17 00:00:00 2001
From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Fri, 26 Jul 2013 03:14:08 +0000
Subject: Update all the code to consume the ConvertDevicePathToText,
 ConvertDevicePathNodeToText, ConvertTextToDevicePath and
 ConvertTextToDeviceNode APIs in DevicePathLib.

Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14505 6f19259b-4bc3-4df7-8a09-765794883524
---
 PerformancePkg/Dp_App/DpUtilities.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'PerformancePkg/Dp_App/DpUtilities.c')

diff --git a/PerformancePkg/Dp_App/DpUtilities.c b/PerformancePkg/Dp_App/DpUtilities.c
index 5e160708b8..4daca0b853 100644
--- a/PerformancePkg/Dp_App/DpUtilities.c
+++ b/PerformancePkg/Dp_App/DpUtilities.c
@@ -1,7 +1,7 @@
 /** @file
   Utility functions used by the Dp application.
 
-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -31,7 +31,6 @@
 #include <Protocol/DriverBinding.h>
 #include <Protocol/ComponentName2.h>
 #include <Protocol/DevicePath.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Guid/Performance.h>
 
@@ -220,7 +219,6 @@ GetNameFromHandle (
   UINTN                       StringSize;
   CHAR8                       *PlatformLanguage;
   EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
 
   //
   // Method 1: Get the name string from image PDB
@@ -336,19 +334,12 @@ GetNameFromHandle (
       //
       // Method 5: Get the name string from image DevicePath
       //
-      Status = gBS->LocateProtocol (
-                      &gEfiDevicePathToTextProtocolGuid,
-                      NULL,
-                      (VOID **) &DevicePathToText
-                      );
-      if (!EFI_ERROR (Status)) {
-        NameString = DevicePathToText->ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);
-        if (NameString != NULL) {
-          StrnCpy (mGaugeString, NameString, DP_GAUGE_STRING_LENGTH);
-          mGaugeString[DP_GAUGE_STRING_LENGTH] = 0;
-          FreePool (NameString);
-          return;
-        }
+      NameString = ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);
+      if (NameString != NULL) {
+        StrnCpy (mGaugeString, NameString, DP_GAUGE_STRING_LENGTH);
+        mGaugeString[DP_GAUGE_STRING_LENGTH] = 0;
+        FreePool (NameString);
+        return;
       }
     }
   }
-- 
cgit v1.2.3