1 files changed, 3 insertions, 13 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index ec54014c321c..68d679e21248 100644
--- 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;