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

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

ACPI / hotplug / PCI: Drop func field from struct acpiphp_bridge 



Since the func pointer in struct acpiphp_context can always be used
instead of the func pointer in struct acpiphp_bridge, drop the
latter.

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

drivers/pci/hotplug/acpiphp.h

+0 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ struct acpiphp_bridge { 
	acpi_handle handle;



	struct acpiphp_context *context;

	/* Ejectable PCI-to-PCI bridge (PCI bridge and PCI function) */

	struct acpiphp_func *func;



	int nr_slots;

drivers/pci/hotplug/acpiphp_glue.c

+1 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void free_bridge(struct kref *kref) 
	context = bridge->context;

	/* Release the reference acquired by acpiphp_enumerate_slots(). */

	if (context->handler_for_func)

		put_bridge(bridge->func->slot->bridge);

		put_bridge(context->func->slot->bridge);



	put_device(&bridge->pci_bus->dev);

	pci_dev_put(bridge->pci_dev);
@@ -1212,7 +1212,6 @@ void acpiphp_enumerate_slots(struct pci_bus *bus) 
	}

	if (context->handler_for_func) {

		/* Notify handler already installed. */

		bridge->func = context->func;

		get_bridge(context->func->slot->bridge);

		return;

	}