Revert "efi: new 'connectefi' command"

This reverts commit 98b6e23.
rhboot · Sep 1, 2022 · cc78de8 · cc78de8
1 parent f08660d
commit cc78de8
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 246 deletions.
diff --git a/NEWS b/NEWS
@@ -98,7 +98,7 @@ New in 2.02:
   * Prefer pmtimer for TSC calibration.
 
 * New/improved platform support:
-  * New `efifwsetup', `lsefi' and `connectefi` commands on EFI platforms.
+  * New `efifwsetup' and `lsefi' commands on EFI platforms.
   * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
   * New command `pcidump' for PCI platforms.
   * Improve opcode parsing in ACPI halt implementation.

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
@@ -833,12 +833,6 @@ module = {
   enable = efi;
 };
 
-module = {
-  name = connectefi;
-  common = commands/efi/connectefi.c;
-  enable = efi;
-};
-
 module = {
   name = blocklist;
   common = commands/blocklist.c;

diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c
diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c
@@ -19,7 +19,6 @@
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/efi/api.h>
-#include <grub/efi/disk.h>
 #include <grub/efi/edid.h>
 #include <grub/efi/pci.h>
 #include <grub/efi/efi.h>

diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
@@ -396,19 +396,6 @@ enumerate_disks (void)
   free_devices (devices);
 }
 
-void
-grub_efidisk_reenumerate_disks (void)
-{
-  free_devices (fd_devices);
-  free_devices (hd_devices);
-  free_devices (cd_devices);
-  fd_devices = 0;
-  hd_devices = 0;
-  cd_devices = 0;
-
-  enumerate_disks ();
-}
-
 static int
 grub_efidisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
 		      grub_disk_pull_t pull)

diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
@@ -95,19 +95,6 @@ grub_efi_locate_handle (grub_efi_locate_search_type_t search_type,
   return buffer;
 }
 
-grub_efi_status_t
-grub_efi_connect_controller (grub_efi_handle_t controller_handle,
-			     grub_efi_handle_t *driver_image_handle,
-			     grub_efi_device_path_protocol_t *remaining_device_path,
-			     grub_efi_boolean_t recursive)
-{
-  grub_efi_boot_services_t *b;
-
-  b = grub_efi_system_table->boot_services;
-  return efi_call_4 (b->connect_controller, controller_handle,
-		     driver_image_handle, remaining_device_path, recursive);
-}
-
 void *
 grub_efi_open_protocol (grub_efi_handle_t handle,
 			grub_efi_guid_t *protocol,

diff --git a/include/grub/efi/disk.h b/include/grub/efi/disk.h
@@ -27,8 +27,6 @@ grub_efi_handle_t
 EXPORT_FUNC(grub_efidisk_get_device_handle) (grub_disk_t disk);
 char *EXPORT_FUNC(grub_efidisk_get_device_name) (grub_efi_handle_t *handle);
 
-void EXPORT_FUNC(grub_efidisk_reenumerate_disks) (void);
-
 void grub_efidisk_init (void);
 void grub_efidisk_fini (void);
 

diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
@@ -41,11 +41,6 @@ EXPORT_FUNC(grub_efi_locate_handle) (grub_efi_locate_search_type_t search_type,
 				     grub_efi_guid_t *protocol,
 				     void *search_key,
 				     grub_efi_uintn_t *num_handles);
-grub_efi_status_t
-EXPORT_FUNC(grub_efi_connect_controller) (grub_efi_handle_t controller_handle,
-					  grub_efi_handle_t *driver_image_handle,
-					  grub_efi_device_path_protocol_t *remaining_device_path,
-					  grub_efi_boolean_t recursive);
 void *EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,
 					   grub_efi_guid_t *protocol,
 					   grub_efi_uint32_t attributes);