@@ -208,27 +208,9 @@ NvmDimmDriverUnload(
208208 UINTN HandleCount = 0 ;
209209 UINTN Index = 0 ;
210210 CONST BOOLEAN DriverAlreadyUnloaded = (gNvmDimmData == NULL );
211- UINTN BufSize = 0 ;
212- EFI_HANDLE * Buffer = NULL ;
213211
214212 NVDIMM_ENTRY ();
215213
216- ReturnCode = gBS -> LocateHandleBuffer (ByProtocol , & gNfitBindingProtocolGuid , NULL , & BufSize , & Buffer );
217- if (ReturnCode == EFI_SUCCESS ) {
218- ReturnCode = gBS -> UninstallMultipleProtocolInterfaces (
219- Buffer [0 ],
220- & gEfiDevicePathProtocolGuid ,
221- & gNvmDimmDriverDevicePath ,
222- NULL );
223- if (EFI_ERROR (ReturnCode )) {
224- NVDIMM_WARN ("Failed to install the gEfiDevicePathProtocolGuid, error = 0x%llx." , ReturnCode );
225- }
226- }
227-
228- if (Buffer != NULL ) {
229- FreePool (Buffer );
230- }
231-
232214 /** Retrieve array of all handles in the handle database **/
233215 ReturnCode = gBS -> LocateHandleBuffer (AllHandles , NULL , NULL , & HandleCount , & pHandleBuffer );
234216 if (EFI_ERROR (ReturnCode )) {
@@ -617,9 +599,6 @@ NvmDimmDriverDriverEntryPoint(
617599 DRIVER_PREFERENCES DriverPreferences ;
618600#ifndef OS_BUILD
619601 EFI_LOADED_IMAGE_PROTOCOL * pLoadedImage = NULL ;
620- EFI_HANDLE * Buffer = NULL ;
621- UINTN BufSize = 0 ;
622- UINTN Index = 0 ;
623602#endif
624603
625604 NVDIMM_ENTRY ();
@@ -753,27 +732,6 @@ NvmDimmDriverDriverEntryPoint(
753732 NvmDimmDriverUnload (ImageHandle );
754733 }
755734
756- /**
757- Install device path protocol so reconnect will find handle
758- **/
759- ReturnCode = gBS -> LocateHandleBuffer (ByProtocol , & gNfitBindingProtocolGuid , NULL , & BufSize , & Buffer );
760- if (ReturnCode == EFI_SUCCESS ) {
761- for (Index = 0 ; Index < BufSize ; Index ++ ) {
762- ReturnCode = gBS -> InstallMultipleProtocolInterfaces (
763- & Buffer [Index ],
764- & gEfiDevicePathProtocolGuid ,
765- & gNvmDimmDriverDevicePath ,
766- NULL );
767- if (EFI_ERROR (ReturnCode )) {
768- NVDIMM_WARN ("Failed to install the gEfiDevicePathProtocolGuid, error = 0x%llx." , ReturnCode );
769- }
770- }
771- }
772-
773- if (Buffer != NULL ) {
774- FreePool (Buffer );
775- }
776-
777735#endif
778736 NVDIMM_DBG ("Exiting DriverEntryPoint, error = " FORMAT_EFI_STATUS ".\n" , ReturnCode );
779737 NVDIMM_EXIT_I64 (ReturnCode );
0 commit comments