Commit 8ee5bdf3 authored by Jiang Liu's avatar Jiang Liu Committed by Bjorn Helgaas

PCI/ACPI: Use normal list for struct acpi_pci_driver

Use normal list for struct acpi_pci_driver to simplify code.
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 059e4ba2
...@@ -72,8 +72,8 @@ static struct acpi_driver acpi_pci_root_driver = { ...@@ -72,8 +72,8 @@ static struct acpi_driver acpi_pci_root_driver = {
}; };
static LIST_HEAD(acpi_pci_roots); static LIST_HEAD(acpi_pci_roots);
static LIST_HEAD(acpi_pci_drivers);
static struct acpi_pci_driver *sub_driver;
static DEFINE_MUTEX(osc_lock); static DEFINE_MUTEX(osc_lock);
int acpi_pci_register_driver(struct acpi_pci_driver *driver) int acpi_pci_register_driver(struct acpi_pci_driver *driver)
...@@ -81,10 +81,7 @@ int acpi_pci_register_driver(struct acpi_pci_driver *driver) ...@@ -81,10 +81,7 @@ int acpi_pci_register_driver(struct acpi_pci_driver *driver)
int n = 0; int n = 0;
struct acpi_pci_root *root; struct acpi_pci_root *root;
struct acpi_pci_driver **pptr = &sub_driver; list_add_tail(&driver->node, &acpi_pci_drivers);
while (*pptr)
pptr = &(*pptr)->next;
*pptr = driver;
if (!driver->add) if (!driver->add)
return 0; return 0;
...@@ -103,14 +100,7 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver) ...@@ -103,14 +100,7 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
{ {
struct acpi_pci_root *root; struct acpi_pci_root *root;
struct acpi_pci_driver **pptr = &sub_driver; list_del(&driver->node);
while (*pptr) {
if (*pptr == driver)
break;
pptr = &(*pptr)->next;
}
BUG_ON(!*pptr);
*pptr = (*pptr)->next;
if (!driver->remove) if (!driver->remove)
return; return;
......
...@@ -138,7 +138,7 @@ void acpi_penalize_isa_irq(int irq, int active); ...@@ -138,7 +138,7 @@ void acpi_penalize_isa_irq(int irq, int active);
void acpi_pci_irq_disable (struct pci_dev *dev); void acpi_pci_irq_disable (struct pci_dev *dev);
struct acpi_pci_driver { struct acpi_pci_driver {
struct acpi_pci_driver *next; struct list_head node;
int (*add)(acpi_handle handle); int (*add)(acpi_handle handle);
void (*remove)(acpi_handle handle); void (*remove)(acpi_handle handle);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment