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

Commit 81ee5732 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

ACPI / hotplug / PCI: Remove pci_configure_slot() usage 



We now configure each PCI device as it is enumerated, in pci_device_add(),
so remove the configuration done in acpiphp.

That configuration, in pci_configure_device(), does not include the
MPS/MRRS configuration done by pcie_bus_configure_settings(), so keep
that here.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
parent b4071663

drivers/pci/hotplug/acpiphp_glue.c

+1 −10
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static DEFINE_MUTEX(bridge_mutex); 
static int acpiphp_hotplug_notify(struct acpi_device *adev, u32 type);

static void acpiphp_post_dock_fixup(struct acpi_device *adev);

static void acpiphp_sanitize_bus(struct pci_bus *bus);

static void acpiphp_set_hpp_values(struct pci_bus *bus);

static void hotplug_event(u32 type, struct acpiphp_context *context);

static void free_bridge(struct kref *kref);
@@ -510,7 +509,7 @@ static void enable_slot(struct acpiphp_slot *slot) 
	__pci_bus_assign_resources(bus, &add_list, NULL);



	acpiphp_sanitize_bus(bus);

	acpiphp_set_hpp_values(bus);

	pcie_bus_configure_settings(bus);

	acpiphp_set_acpi_region(slot);



	list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -702,14 +701,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge) 
	}

}



static void acpiphp_set_hpp_values(struct pci_bus *bus)

{

	struct pci_dev *dev;



	list_for_each_entry(dev, &bus->devices, bus_list)

		pci_configure_slot(dev);

}



/*

 * Remove devices for which we could not assign resources, call

 * arch specific code to fix-up the bus