From: Taku Izumi <izumi.taku@jp.fujitsu.com>
To: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Yinghai Lu <yinghai@kernel.org>, Jiang Liu <jiang.liu@huawei.com>
Subject: [PATCH 3/7] ACPI, PCI: Use normal list for struct acpi_pci_driver
Date: Wed, 4 Jul 2012 17:08:11 +0900 [thread overview]
Message-ID: <20120704170811.98ec88dc.izumi.taku@jp.fujitsu.com> (raw)
In-Reply-To: <20120704170345.07cd0ad7.izumi.taku@jp.fujitsu.com>
From: Jiang Liu <jiang.liu@huawei.com>
ACPI, PCI: 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>
Index: linux/drivers/acpi/pci_root.c
===================================================================
--- linux.orig/drivers/acpi/pci_root.c 2012-07-04 09:54:52.061486507 +0900
+++ linux/drivers/acpi/pci_root.c 2012-07-04 09:55:45.697815965 +0900
@@ -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_tail(&driver->node, &acpi_pci_drivers);
if (!driver->add)
return 0;
@@ -103,14 +100,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->node);
if (!driver->remove)
return;
Index: linux/include/linux/acpi.h
===================================================================
--- linux.orig/include/linux/acpi.h 2012-07-04 09:54:52.061486507 +0900
+++ linux/include/linux/acpi.h 2012-07-04 09:55:45.697815965 +0900
@@ -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 node;
int (*add)(acpi_handle handle);
void (*remove)(acpi_handle handle);
};
next prev parent reply other threads:[~2012-07-04 8:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-04 8:03 [PATCH 0/7] acpi, pci: hostbridge hotplug support Taku Izumi
2012-07-04 8:06 ` [PATCH 1/7] x86, PCI: Fix non acpi path pci_sysdata leaking with release_fn Taku Izumi
2012-07-04 8:07 ` [PATCH 2/7] PCI: Correctly clean up pci root buses in function pci_remove_bus() Taku Izumi
2012-07-04 8:08 ` Taku Izumi [this message]
2012-07-04 8:08 ` [PATCH 4/7] ACPI, PCI: Notify acpi_pci_drivers when hot-plugging PCI root bridges Taku Izumi
2012-07-04 8:09 ` [PATCH 5/7] ACPI, PCI: Protect global lists in drivers/acpi/pci_root.c Taku Izumi
2012-07-04 8:10 ` [PATCH 6/7] ACPI, PCI: add hostbridge removal function Taku Izumi
2012-07-04 8:11 ` [PATCH 7/7] ACPI, PCI: add resoruce-assign code for devices under hot-added hostbridge Taku Izumi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120704170811.98ec88dc.izumi.taku@jp.fujitsu.com \
--to=izumi.taku@jp.fujitsu.com \
--cc=bhelgaas@google.com \
--cc=jiang.liu@huawei.com \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-pci@vger.kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).