leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI/ACPI: Use normal list for struct acpi_pci_driver

Browse Source 
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>
This commit is contained in:
Jiang Liu 2012-09-18 15:19:49 +09:00 committed by Bjorn Helgaas
parent 059e4ba292
commit 8ee5bdf3e9
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/acpi/pci_root.c
View File

@ -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)
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)
{ {
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;

2
include/linux/acpi.h
View File

@ -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);
}; };