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

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

ACPI / hotplug / PCI: Drop handle field from struct acpiphp_func 



The ACPI handle stored in struct acpiphp_func is also stored in the
struct acpiphp_context object containing it and it is trivial to get
from a struct acpiphp_func pointer to the handle field of the outer
struct acpiphp_context.

Hence, the handle field of struct acpiphp_func is redundant, so drop
it and provide a helper function, func_to_handle(), allowing it
users to get the ACPI handle for the given struct acpiphp_func
pointer.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent bd4674df

drivers/pci/hotplug/acpiphp.h

+5 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ struct acpiphp_func { 
	struct acpiphp_slot *slot;	/* parent */



	struct list_head sibling;

	acpi_handle	handle;



	u8		function;	/* pci function# */

	u32		flags;		/* see below */
@@ -137,6 +136,11 @@ static inline struct acpiphp_context *func_to_context(struct acpiphp_func *func) 
	return container_of(func, struct acpiphp_context, func);

}



static inline acpi_handle func_to_handle(struct acpiphp_func *func)

{

	return func_to_context(func)->handle;

}



/*

 * struct acpiphp_attention_info - device specific attention registration

 *

drivers/pci/hotplug/acpiphp_glue.c

+31 −23
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data, 
		return AE_NOT_EXIST;

	}

	newfunc = &context->func;

	newfunc->handle = handle;

	newfunc->function = function;

	mutex_unlock(&acpiphp_context_lock);
@@ -425,11 +424,13 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge) 


	list_for_each_entry(slot, &bridge->slots, node) {

		list_for_each_entry(func, &slot->funcs, sibling) {

			if (is_dock_device(func->handle)) {

				unregister_hotplug_dock_device(func->handle);

			}

			acpi_handle handle = func_to_handle(func);



			if (is_dock_device(handle))

				unregister_hotplug_dock_device(handle);



			if (!(func->flags & FUNC_HAS_DCK)) {

				status = acpi_remove_notify_handler(func->handle,

				status = acpi_remove_notify_handler(handle,

							ACPI_SYSTEM_NOTIFY,

							handle_hotplug_event);

				if (ACPI_FAILURE(status))
@@ -457,7 +458,8 @@ static int power_on_slot(struct acpiphp_slot *slot) 
	list_for_each_entry(func, &slot->funcs, sibling) {

		if (func->flags & FUNC_HAS_PS0) {

			dbg("%s: executing _PS0\n", __func__);

			status = acpi_evaluate_object(func->handle, "_PS0", NULL, NULL);

			status = acpi_evaluate_object(func_to_handle(func),

						      "_PS0", NULL, NULL);

			if (ACPI_FAILURE(status)) {

				warn("%s: _PS0 failed\n", __func__);

				retval = -1;
@@ -489,7 +491,8 @@ static int power_off_slot(struct acpiphp_slot *slot) 


	list_for_each_entry(func, &slot->funcs, sibling) {

		if (func->flags & FUNC_HAS_PS3) {

			status = acpi_evaluate_object(func->handle, "_PS3", NULL, NULL);

			status = acpi_evaluate_object(func_to_handle(func),

						      "_PS3", NULL, NULL);

			if (ACPI_FAILURE(status)) {

				warn("%s: _PS3 failed\n", __func__);

				retval = -1;
@@ -543,10 +546,11 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus) 
 */

static int acpiphp_bus_add(struct acpiphp_func *func)

{

	acpi_handle handle = func_to_handle(func);

	struct acpi_device *device;

	int ret_val;



	if (!acpi_bus_get_device(func->handle, &device)) {

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

		dbg("bus exists... trim\n");

		/* this shouldn't be in here, so remove

		 * the bus then re-add it...
@@ -554,9 +558,9 @@ static int acpiphp_bus_add(struct acpiphp_func *func) 
		acpi_bus_trim(device);

	}



	ret_val = acpi_bus_scan(func->handle);

	ret_val = acpi_bus_scan(handle);

	if (!ret_val)

		ret_val = acpi_bus_get_device(func->handle, &device);

		ret_val = acpi_bus_get_device(handle, &device);



	if (ret_val)

		dbg("error adding bus, %x\n", -ret_val);
@@ -598,7 +602,8 @@ static void acpiphp_set_acpi_region(struct acpiphp_slot *slot) 
		params[1].type = ACPI_TYPE_INTEGER;

		params[1].integer.value = 1;

		/* _REG is optional, we don't care about if there is failure */

		acpi_evaluate_object(func->handle, "_REG", &arg_list, NULL);

		acpi_evaluate_object(func_to_handle(func), "_REG", &arg_list,

				     NULL);

	}

}
@@ -739,9 +744,8 @@ static int disable_device(struct acpiphp_slot *slot) 
		pci_dev_put(pdev);

	}



	list_for_each_entry(func, &slot->funcs, sibling) {

		acpiphp_bus_trim(func->handle);

	}

	list_for_each_entry(func, &slot->funcs, sibling)

		acpiphp_bus_trim(func_to_handle(func));



	slot->flags &= (~SLOT_ENABLED);
@@ -763,17 +767,20 @@ static int disable_device(struct acpiphp_slot *slot) 
 */

static unsigned int get_slot_status(struct acpiphp_slot *slot)

{

	acpi_status status;

	unsigned long long sta = 0;

	u32 dvid;

	struct acpiphp_func *func;



	list_for_each_entry(func, &slot->funcs, sibling) {

		if (func->flags & FUNC_HAS_STA) {

			status = acpi_evaluate_integer(func->handle, "_STA", NULL, &sta);

			acpi_status status;



			status = acpi_evaluate_integer(func_to_handle(func),

						       "_STA", NULL, &sta);

			if (ACPI_SUCCESS(status) && sta)

				break;

		} else {

			u32 dvid;



			pci_bus_read_config_dword(slot->bridge->pci_bus,

						  PCI_DEVFN(slot->device,

							    func->function),
@@ -798,13 +805,14 @@ int acpiphp_eject_slot(struct acpiphp_slot *slot) 


	list_for_each_entry(func, &slot->funcs, sibling) {

		/* We don't want to call _EJ0 on non-existing functions. */

		if ((func->flags & FUNC_HAS_EJ0)) {

			if (ACPI_FAILURE(acpi_evaluate_ej0(func->handle)))

		if (!(func->flags & FUNC_HAS_EJ0))

			continue;



		if (ACPI_FAILURE(acpi_evaluate_ej0(func_to_handle(func))))

			return -1;

		else

			break;

	}

	}

	return 0;

}