aboutsummaryrefslogtreecommitdiff
path: root/lib/efi_loader
diff options
context:
space:
mode:
Diffstat (limited to 'lib/efi_loader')
-rw-r--r--lib/efi_loader/efi_disk.c25
-rw-r--r--lib/efi_loader/efi_setup.c4
2 files changed, 2 insertions, 27 deletions
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 79b28097b6..a04ab338fc 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -625,7 +625,7 @@ static int efi_disk_create_part(struct udevice *dev)
*
* @return 0 on success, -1 otherwise
*/
-static int efi_disk_probe(void *ctx, struct event *event)
+int efi_disk_probe(void *ctx, struct event *event)
{
struct udevice *dev;
enum uclass_id id;
@@ -729,7 +729,7 @@ static int efi_disk_delete_part(struct udevice *dev)
*
* @return 0 on success, -1 otherwise
*/
-static int efi_disk_remove(void *ctx, struct event *event)
+int efi_disk_remove(void *ctx, struct event *event)
{
enum uclass_id id;
struct udevice *dev;
@@ -745,27 +745,6 @@ static int efi_disk_remove(void *ctx, struct event *event)
return 0;
}
-efi_status_t efi_disk_init(void)
-{
- int ret;
-
- ret = event_register("efi_disk add", EVT_DM_POST_PROBE,
- efi_disk_probe, NULL);
- if (ret) {
- log_err("Event registration for efi_disk add failed\n");
- return EFI_OUT_OF_RESOURCES;
- }
-
- ret = event_register("efi_disk del", EVT_DM_PRE_REMOVE,
- efi_disk_remove, NULL);
- if (ret) {
- log_err("Event registration for efi_disk del failed\n");
- return EFI_OUT_OF_RESOURCES;
- }
-
- return EFI_SUCCESS;
-}
-
/**
* efi_disk_get_device_name() - get U-Boot device name associated with EFI handle
*
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index 113d5d5d56..9d7189336d 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -200,10 +200,6 @@ static efi_status_t __efi_init_early(void)
/* Initialize EFI driver uclass */
ret = efi_driver_init();
- if (ret != EFI_SUCCESS)
- goto out;
-
- ret = efi_disk_init();
out:
return ret;
}