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

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

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



The only bridge flag used by the ACPI-based PCI hotplug (ACPIPHP)
code is BRIDGE_HAS_EJ0, but it is only used by the event handling
function hotplug_event() and if that flag is set, the corresponding
function flag FUNC_HAS_EJ0 is set as well, so that bridge flag is
redundant.

For this reason, drop BRIDGE_HAS_EJ0 and all code referring to it
and since it is the only bridge flag defined, drop the flags field
from struct acpiphp_bridge entirely.

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

drivers/pci/hotplug/acpiphp.h

+0 −5
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ struct acpiphp_bridge { 


	int nr_slots;



	u32 flags;



	/* This bus (host bridge) or Secondary bus (PCI-to-PCI bridge) */

	struct pci_bus *pci_bus;
@@ -154,9 +152,6 @@ struct acpiphp_attention_info 
/* ACPI _STA method value (ignore bit 4; battery present) */

#define ACPI_STA_ALL			(0x0000000f)



/* bridge flags */

#define BRIDGE_HAS_EJ0		(0x00000001)



/* slot flags */



#define SLOT_POWEREDON		(0x00000001)

drivers/pci/hotplug/acpiphp_glue.c

+0 −9
Original line number Diff line number Diff line
@@ -986,9 +986,6 @@ static void hotplug_event(acpi_handle handle, u32 type, void *data) 
	case ACPI_NOTIFY_EJECT_REQUEST:

		/* request device eject */

		dbg("%s: Device eject notify on %s\n", __func__, objname);

		if (bridge && !(bridge->flags & BRIDGE_HAS_EJ0))

			break;



		if (!(acpiphp_disable_slot(func->slot)))

			acpiphp_eject_slot(func->slot);
@@ -1125,12 +1122,6 @@ void acpiphp_enumerate_slots(struct pci_bus *bus) 
		mutex_unlock(&acpiphp_context_lock);

	}



	status = acpi_get_handle(bridge->handle, "_EJ0", &handle);

	if (ACPI_SUCCESS(status)) {

		dbg("found ejectable p2p bridge\n");

		bridge->flags |= BRIDGE_HAS_EJ0;

	}



	/* must be added to the list prior to calling register_slot */

	mutex_lock(&bridge_mutex);

	list_add(&bridge->list, &bridge_list);