ACPI: Introduce acpi_unload_parent_table() usages in Linux kernel (e044d8f9) · Commits · 戴 / test

drivers/acpi/acpica/nsxfobj.c

+0 −44

Original line number	Diff line number	Diff line
		@@ -51,50 +51,6 @@
		#define _COMPONENT ACPI_NAMESPACE
		ACPI_MODULE_NAME("nsxfobj")

		/*******************************************************************************
		*
		* FUNCTION: acpi_get_id
		*
		* PARAMETERS: Handle - Handle of object whose id is desired
		* ret_id - Where the id will be placed
		*
		* RETURN: Status
		*
		* DESCRIPTION: This routine returns the owner id associated with a handle
		*
		******************************************************************************/
		acpi_status acpi_get_id(acpi_handle handle, acpi_owner_id * ret_id)
		{
		struct acpi_namespace_node *node;
		acpi_status status;

		/* Parameter Validation */

		if (!ret_id) {
		return (AE_BAD_PARAMETER);
		}

		status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
		if (ACPI_FAILURE(status)) {
		return (status);
		}

		/* Convert and validate the handle */

		node = acpi_ns_validate_handle(handle);
		if (!node) {
		(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
		return (AE_BAD_PARAMETER);
		}

		*ret_id = node->owner_id;

		status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
		return (status);
		}

		ACPI_EXPORT_SYMBOL(acpi_get_id)

		/*******************************************************************************
		*
		* FUNCTION: acpi_get_type

drivers/acpi/acpica/tbxface.c

+0 −46

Original line number	Diff line number	Diff line
		@@ -263,52 +263,6 @@ acpi_get_table_header(char *signature,

		ACPI_EXPORT_SYMBOL(acpi_get_table_header)

		/*******************************************************************************
		*
		* FUNCTION: acpi_unload_table_id
		*
		* PARAMETERS: id - Owner ID of the table to be removed.
		*
		* RETURN: Status
		*
		* DESCRIPTION: This routine is used to force the unload of a table (by id)
		*
		******************************************************************************/
		acpi_status acpi_unload_table_id(acpi_owner_id id)
		{
		int i;
		acpi_status status = AE_NOT_EXIST;

		ACPI_FUNCTION_TRACE(acpi_unload_table_id);

		status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
		if (ACPI_FAILURE(status)) {
		return_ACPI_STATUS(status);
		}

		/* Find table in the global table list */
		for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
		if (id != acpi_gbl_root_table_list.tables[i].owner_id) {
		continue;
		}
		/*
		* Delete all namespace objects owned by this table. Note that these
		* objects can appear anywhere in the namespace by virtue of the AML
		* "Scope" operator. Thus, we need to track ownership by an ID, not
		* simply a position within the hierarchy
		*/
		acpi_tb_delete_namespace_by_owner(i);
		status = acpi_tb_release_owner_id(i);
		acpi_tb_set_table_loaded_flag(i, FALSE);
		break;
		}

		(void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
		return_ACPI_STATUS(status);
		}

		ACPI_EXPORT_SYMBOL(acpi_unload_table_id)

		/*******************************************************************************
		*
		* FUNCTION: acpi_get_table_with_size

drivers/pci/hotplug/sgi_hotplug.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -475,7 +475,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
		struct slot *slot = bss_hotplug_slot->private;
		struct pci_dev dev, temp;
		int rc;
		acpi_owner_id ssdt_id = 0;
		acpi_handle ssdt_hdl = NULL;

		/* Acquire update access to the bus */
		mutex_lock(&sn_hotplug_mutex);
		@@ -522,7 +522,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
		if (ACPI_SUCCESS(ret) &&
		(adr>>16) == (slot->device_num + 1)) {
		/* retain the owner id */
		acpi_get_id(chandle, &ssdt_id);
		ssdt_hdl = chandle;

		ret = acpi_bus_get_device(chandle,
		&device);
		@@ -547,12 +547,13 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
		pci_unlock_rescan_remove();

		/* Remove the SSDT for the slot from the ACPI namespace */
		if (SN_ACPI_BASE_SUPPORT() && ssdt_id) {
		if (SN_ACPI_BASE_SUPPORT() && ssdt_hdl) {
		acpi_status ret;
		ret = acpi_unload_table_id(ssdt_id);
		ret = acpi_unload_parent_table(ssdt_hdl);
		if (ACPI_FAILURE(ret)) {
		printk(KERN_ERR "%s: acpi_unload_table_id failed (0x%x) for id %d\n",
		__func__, ret, ssdt_id);
		acpi_handle_err(ssdt_hdl,
		"%s: acpi_unload_parent_table failed (0x%x)\n",
		__func__, ret);
		/* try to continue on */
		}
		}

include/acpi/acpixf.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -890,12 +890,6 @@ ACPI_APP_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(1)
		*/
		ACPI_GLOBAL(u8, acpi_gbl_permanent_mmap);

		ACPI_EXTERNAL_RETURN_STATUS(acpi_status
		acpi_get_id(acpi_handle object,
		acpi_owner_id * out_type))

		ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_unload_table_id(acpi_owner_id id))

		ACPI_EXTERNAL_RETURN_STATUS(acpi_status
		acpi_get_table_with_size(acpi_string signature,
		u32 instance,

Admin message