Perfected MSA files.

[mirror_edk2.git] / EdkModulePkg / Bus / Scsi / ScsiDisk / Dxe / ComponentName.c

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
index 15f02d6c41a22b53fea34991ffe9d088f52e79a4..74a41e869e1f7e03f901b87ff044bfcee461d874 100644 (file)
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ComponentName.c
@@ -19,27 +19,6 @@ Abstract:
 \r
 #include "ScsiDisk.h"\r
 \r
 \r
 #include "ScsiDisk.h"\r
 \r

-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ScsiDiskComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r

 //\r
 // EFI Component Name Protocol\r
 //\r
 //\r
 // EFI Component Name Protocol\r
 //\r


@@ -162,6 +141,17 @@ ScsiDiskComponentNameGetControllerName (
     return EFI_UNSUPPORTED;\r
   }\r
   \r
     return EFI_UNSUPPORTED;\r
   }\r
   \r

+  //\r
+  // Make sure this driver is currently managing ControllerHandle\r
+  //\r
+  Status = EfiTestManagedDevice (\r
+             ControllerHandle,\r
+             gScsiDiskDriverBinding.DriverBindingHandle,\r
+             &gEfiScsiIoProtocolGuid\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r

   //\r
   // Get the device context\r
   //\r
   //\r
   // Get the device context\r
   //\r