Patchwork [1/4] acpi, pci: introduce list for acpi_pci_root drivers

login
register
mail settings
Submitter Taku Izumi
Date June 21, 2012, 9:37 a.m.
Message ID <20120621183706.b5e4417d.izumi.taku@jp.fujitsu.com>
Download mbox | patch
Permalink /patch/166276/
State Superseded
Headers show

Comments

Taku Izumi - June 21, 2012, 9:37 a.m.
Use struct list_head for pci root sub drivers manipulation. This has
no functional change.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
---
 drivers/acpi/pci_root.c |   17 +++--------------
 include/linux/acpi.h    |    2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux/drivers/acpi/pci_root.c
===================================================================
--- linux.orig/drivers/acpi/pci_root.c
+++ linux/drivers/acpi/pci_root.c
@@ -72,8 +72,8 @@  static struct acpi_driver acpi_pci_root_
 };
 
 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
 	int n = 0;
 	struct acpi_pci_root *root;
 
-	struct acpi_pci_driver **pptr = &sub_driver;
-	while (*pptr)
-		pptr = &(*pptr)->next;
-	*pptr = driver;
+	list_add(&driver->list, &acpi_pci_drivers);
 
 	if (!driver->add)
 		return 0;
@@ -93,7 +90,6 @@  int acpi_pci_register_driver(struct acpi
 		driver->add(root->device->handle);
 		n++;
 	}
-
 	return n;
 }
 
@@ -103,14 +99,7 @@  void acpi_pci_unregister_driver(struct a
 {
 	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->list);
 
 	if (!driver->remove)
 		return;
Index: linux/include/linux/acpi.h
===================================================================
--- linux.orig/include/linux/acpi.h
+++ linux/include/linux/acpi.h
@@ -138,7 +138,7 @@  void acpi_penalize_isa_irq(int irq, int 
 void acpi_pci_irq_disable (struct pci_dev *dev);
 
 struct acpi_pci_driver {
-	struct acpi_pci_driver *next;
+	struct list_head list;
 	int (*add)(acpi_handle handle);
 	void (*remove)(acpi_handle handle);
 };