diff options
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 48 | 
1 files changed, 1 insertions, 47 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 0ac546d5e53..b80e06e0b2d 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -65,44 +65,12 @@ static struct acpi_scan_handler pci_root_handler = {  	.detach = acpi_pci_root_remove,  }; -/* Lock to protect both acpi_pci_roots and acpi_pci_drivers lists */ +/* Lock to protect both acpi_pci_roots lists */  static DEFINE_MUTEX(acpi_pci_root_lock);  static LIST_HEAD(acpi_pci_roots); -static LIST_HEAD(acpi_pci_drivers);  static DEFINE_MUTEX(osc_lock); -int acpi_pci_register_driver(struct acpi_pci_driver *driver) -{ -	int n = 0; -	struct acpi_pci_root *root; - -	mutex_lock(&acpi_pci_root_lock); -	list_add_tail(&driver->node, &acpi_pci_drivers); -	if (driver->add) -		list_for_each_entry(root, &acpi_pci_roots, node) { -			driver->add(root); -			n++; -		} -	mutex_unlock(&acpi_pci_root_lock); - -	return n; -} -EXPORT_SYMBOL(acpi_pci_register_driver); - -void acpi_pci_unregister_driver(struct acpi_pci_driver *driver) -{ -	struct acpi_pci_root *root; - -	mutex_lock(&acpi_pci_root_lock); -	list_del(&driver->node); -	if (driver->remove) -		list_for_each_entry(root, &acpi_pci_roots, node) -			driver->remove(root); -	mutex_unlock(&acpi_pci_root_lock); -} -EXPORT_SYMBOL(acpi_pci_unregister_driver); -  /**   * acpi_is_root_bridge - determine whether an ACPI CA node is a PCI root bridge   * @handle - the ACPI CA node in question. @@ -413,7 +381,6 @@ static int acpi_pci_root_add(struct acpi_device *device,  	acpi_status status;  	int result;  	struct acpi_pci_root *root; -	struct acpi_pci_driver *driver;  	u32 flags, base_flags;  	bool is_osc_granted = false; @@ -573,12 +540,6 @@ static int acpi_pci_root_add(struct acpi_device *device,  		pci_assign_unassigned_bus_resources(root->bus);  	} -	mutex_lock(&acpi_pci_root_lock); -	list_for_each_entry(driver, &acpi_pci_drivers, node) -		if (driver->add) -			driver->add(root); -	mutex_unlock(&acpi_pci_root_lock); -  	/* need to after hot-added ioapic is registered */  	if (system_state != SYSTEM_BOOTING)  		pci_enable_bridges(root->bus); @@ -599,16 +560,9 @@ end:  static void acpi_pci_root_remove(struct acpi_device *device)  {  	struct acpi_pci_root *root = acpi_driver_data(device); -	struct acpi_pci_driver *driver;  	pci_stop_root_bus(root->bus); -	mutex_lock(&acpi_pci_root_lock); -	list_for_each_entry_reverse(driver, &acpi_pci_drivers, node) -		if (driver->remove) -			driver->remove(root); -	mutex_unlock(&acpi_pci_root_lock); -  	device_set_run_wake(root->bus->bridge, false);  	pci_acpi_remove_bus_pm_notifier(device);  |