Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfee26db authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / scan: Make it clear that acpi_bus_trim() cannot fail 



Since acpi_bus_trim() cannot fail, change its definition to a void
function, so that its callers don't check the return value in vain
and update the callers.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
parent b8bd759a

drivers/acpi/dock.c

+2 −6
Original line number Diff line number Diff line
@@ -336,13 +336,9 @@ static struct acpi_device * dock_create_acpi_device(acpi_handle handle) 
static void dock_remove_acpi_device(acpi_handle handle)

{

	struct acpi_device *device;

	int ret;



	if (!acpi_bus_get_device(handle, &device)) {

		ret = acpi_bus_trim(device);

		if (ret)

			pr_debug("error removing bus, %x\n", -ret);

	}

	if (!acpi_bus_get_device(handle, &device))

		acpi_bus_trim(device);

}



/**

drivers/acpi/scan.c

+3 −9
Original line number Diff line number Diff line
@@ -127,13 +127,8 @@ void acpi_bus_hot_remove_device(void *context) 
	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

		"Hot-removing device %s...\n", dev_name(&device->dev)));



	if (acpi_bus_trim(device)) {

		printk(KERN_ERR PREFIX

				"Removing device failed\n");

		goto err_out;

	}



	/* device has been freed */

	acpi_bus_trim(device);

	/* Device node has been released. */

	device = NULL;



	/* power off device */
@@ -1631,7 +1626,7 @@ static acpi_status acpi_bus_remove(acpi_handle handle, u32 lvl_not_used, 
	return AE_OK;

}



int acpi_bus_trim(struct acpi_device *start)

void acpi_bus_trim(struct acpi_device *start)

{

	/*

	 * Execute acpi_bus_device_detach() as a post-order callback to detach
@@ -1647,7 +1642,6 @@ int acpi_bus_trim(struct acpi_device *start) 
	acpi_walk_namespace(ACPI_TYPE_ANY, start->handle, ACPI_UINT32_MAX, NULL,

			    acpi_bus_remove, NULL, NULL);

	acpi_bus_remove(start->handle, 0, NULL, NULL);

	return 0;

}

EXPORT_SYMBOL_GPL(acpi_bus_trim);

drivers/pci/hotplug/acpiphp_glue.c

+3 −7
Original line number Diff line number Diff line
@@ -742,8 +742,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func) 
		/* this shouldn't be in here, so remove

		 * the bus then re-add it...

		 */

		ret_val = acpi_bus_trim(device);

		dbg("acpi_bus_trim return %x\n", ret_val);

		acpi_bus_trim(device);

	}



	ret_val = acpi_bus_scan(func->handle);
@@ -772,11 +771,8 @@ static int acpiphp_bus_trim(acpi_handle handle) 
		return retval;

	}



	retval = acpi_bus_trim(device);

	if (retval)

		err("cannot remove from acpi list\n");



	return retval;

	acpi_bus_trim(device);

	return 0;

}



static void acpiphp_set_acpi_region(struct acpiphp_slot *slot)

include/acpi/acpi_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver); 
void acpi_bus_unregister_driver(struct acpi_driver *driver);

int acpi_bus_scan(acpi_handle handle);

void acpi_bus_hot_remove_device(void *context);

int acpi_bus_trim(struct acpi_device *start);

void acpi_bus_trim(struct acpi_device *start);

acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);

int acpi_match_device_ids(struct acpi_device *device,

			  const struct acpi_device_id *ids);