PCI/ACPI: Use normal list for struct acpi_pci_driver

Use normal list for struct acpi_pci_driver to simplify code.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index ec54014c321c5ffd72cf46cc14d877ecbdec1925..68d679e212485f76526f9843e2cea96c3cb11d56 100644 (file)
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -72,8 +72,8 @@ static struct acpi_driver acpi_pci_root_driver = {
 };
 
 static LIST_HEAD(acpi_pci_roots);
+static LIST_HEAD(acpi_pci_drivers);
 
-static struct acpi_pci_driver *sub_driver;
 static DEFINE_MUTEX(osc_lock);
 
 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;
        struct acpi_pci_root *root;
 
-       struct acpi_pci_driver **pptr = &sub_driver;
-       while (*pptr)
-               pptr = &(*pptr)->next;
-       *pptr = driver;
+       list_add_tail(&driver->node, &acpi_pci_drivers);
 
        if (!driver->add)
                return 0;
@@ -103,14 +100,7 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
 {
        struct acpi_pci_root *root;
 
-       struct acpi_pci_driver **pptr = &sub_driver;
-       while (*pptr) {
-               if (*pptr == driver)
-                       break;
-               pptr = &(*pptr)->next;
-       }
-       BUG_ON(!*pptr);
-       *pptr = (*pptr)->next;
+       list_del(&driver->node);
 
        if (!driver->remove)
                return;

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3ad510b25283ee1e5285929b702d739fb0afc31a..a54cf8e512adb97ded31821ca760e020a00b071d 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -138,7 +138,7 @@ void acpi_penalize_isa_irq(int irq, int active);
 void acpi_pci_irq_disable (struct pci_dev *dev);
 
 struct acpi_pci_driver {
-       struct acpi_pci_driver *next;
+       struct list_head node;
        int (*add)(acpi_handle handle);
        void (*remove)(acpi_handle handle);
 };