diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
index da0a11020e09..712e0051e5f5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
@@ -301,8 +301,9 @@ static bool amdgpu_acpi_vfct_bios(struct amdgpu_device *adev)
 	GOP_VBIOS_CONTENT *vbios;
 	VFCT_IMAGE_HEADER *vhdr;
 
-	if (!ACPI_SUCCESS(acpi_get_table_with_size("VFCT", 1, &hdr, &tbl_size)))
+	if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr)))
 		return false;
+	tbl_size = hdr->length;
 	if (tbl_size < sizeof(UEFI_ACPI_VFCT)) {
 		DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n");
 		goto out_unmap;
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 4c3dd6f9ea8b..a38511316a75 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -603,8 +603,9 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
 	GOP_VBIOS_CONTENT *vbios;
 	VFCT_IMAGE_HEADER *vhdr;
 
-	if (!ACPI_SUCCESS(acpi_get_table_with_size("VFCT", 1, &hdr, &tbl_size)))
+	if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr)))
 		return false;
+	tbl_size = hdr->length;
 	if (tbl_size < sizeof(UEFI_ACPI_VFCT)) {
 		DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n");
 		goto out_unmap;
diff --git a/sys/compat/linuxkpi/common/include/acpi/acpixf.h b/sys/compat/linuxkpi/common/include/acpi/acpixf.h
index 13785afcc482..f3f623907071 100644
--- a/sys/compat/linuxkpi/common/include/acpi/acpixf.h
+++ b/sys/compat/linuxkpi/common/include/acpi/acpixf.h
@@ -946,21 +946,6 @@ void acpi_terminate_debugger(void);
 /*
  * Divergences
  */
-ACPI_GLOBAL(u8, acpi_gbl_permanent_mmap);
-
-ACPI_EXTERNAL_RETURN_STATUS(acpi_status
-			    acpi_get_table_with_size(acpi_string signature,
-						     u32 instance,
-						     struct acpi_table_header
-						     **out_table,
-						     acpi_size *tbl_size))
-
-ACPI_EXTERNAL_RETURN_STATUS(acpi_status
-			    acpi_get_data_full(acpi_handle object,
-					       acpi_object_handler handler,
-					       void **data,
-					       void (*callback)(void *)))
-
 void acpi_run_debugger(char *batch_buffer);
 
 void acpi_set_debugger_thread_id(acpi_thread_id thread_id);
diff --git a/sys/compat/linuxkpi/common/include/linux/acpi.h b/sys/compat/linuxkpi/common/include/linux/acpi.h
index 95e043d2629b..2e6bd243eeab 100644
--- a/sys/compat/linuxkpi/common/include/linux/acpi.h
+++ b/sys/compat/linuxkpi/common/include/linux/acpi.h
@@ -54,15 +54,8 @@ acpi_dev_name(struct acpi_device *adev)
 void acpi_scan_drop_device(acpi_handle handle, void *context);
 
 
-int acpi_get_device_data(acpi_handle handle, struct acpi_device **device,
-			 void (*callback)(void *));
-
 struct pci_dev *acpi_get_pci_dev(acpi_handle handle);
 
-static inline int
-acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
-{
-	return acpi_get_device_data(handle, device, NULL);
-}
+int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device);
 
 #endif
diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c
index 0970d5b036ea..2fec9196ece3 100644
--- a/sys/compat/linuxkpi/common/src/linux_acpi.c
+++ b/sys/compat/linuxkpi/common/src/linux_acpi.c
@@ -13,10 +13,6 @@ extern acpi_handle acpi_lid_handle;
 
 #define acpi_handle_warn(handle, fmt, ...)
 
-extern acpi_status
-AcpiGetDataFull(acpi_handle obj_handle, acpi_object_handler handler,
-		void **data, void (*callback)(void *));
-
 acpi_status
 AcpiGetData(acpi_handle obj_handle, acpi_object_handler handler, void **data);
 
@@ -53,9 +49,7 @@ AcpiGetHandle(acpi_handle parent,
     acpi_string pathname, acpi_handle * ret_handle);
 
 acpi_status
-AcpiGetTableWithSize(char *signature,
-		     u32 instance, struct acpi_table_header **out_table,
-		     acpi_size *tbl_size);
+AcpiGetTable(acpi_string signature, u32 instance, struct acpi_table_header **out_table);
 
 
 
@@ -129,14 +123,6 @@ acpi_evaluate_object_typed(acpi_handle handle,
 	return (AcpiEvaluateObjectTyped(handle, pathname, external_params, return_buffer, return_type));
 }
 
-acpi_status
-acpi_get_data_full(acpi_handle obj_handle, acpi_object_handler handler,
-		   void **data, void (*callback)(void *))
-{
-
-	return (AcpiGetDataFull(obj_handle, handler, data, callback));
-}
-
 acpi_status
 acpi_get_data(acpi_handle obj_handle, acpi_object_handler handler, void **data)
 {
@@ -171,12 +157,10 @@ acpi_get_handle(acpi_handle parent,
 }
 
 acpi_status
-acpi_get_table_with_size(char *signature,
-	       u32 instance, struct acpi_table_header **out_table,
-	       acpi_size *tbl_size)
+acpi_get_table(acpi_string signature, u32 instance, struct acpi_table_header **out_table)
 {
 
-	return (AcpiGetTableWithSize(signature, instance, out_table, tbl_size));
+	return (AcpiGetTable(signature, instance, out_table));
 }
 
 bool
@@ -389,16 +373,14 @@ acpi_scan_drop_device(acpi_handle handle, void *context)
 }
 
 int
-acpi_get_device_data(acpi_handle handle, struct acpi_device **device,
-				void (*callback)(void *))
+acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
 {
 	acpi_status status;
 
 	if (!device)
 		return -EINVAL;
 
-	status = acpi_get_data_full(handle, acpi_scan_drop_device,
-				    (void **)device, callback);
+	status = acpi_get_data(handle, acpi_scan_drop_device, (void **)device);
 	if (ACPI_FAILURE(status) || !*device) {
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No context for object [%p]\n",
 				  handle));