From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>,
Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org
Subject: [PATCH 07/10] PCI, ACPI: Remove not used acpi_pci_root_start()
Date: Mon, 1 Oct 2012 23:33:05 -0700 [thread overview]
Message-ID: <1349159588-15029-8-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1349159588-15029-1-git-send-email-yinghai@kernel.org>
pci_add_bus_devices has been moved out.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
---
drivers/acpi/pci_root.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index e63a58d..8134f72 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -47,7 +47,6 @@ ACPI_MODULE_NAME("pci_root");
#define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge"
static int acpi_pci_root_add(struct acpi_device *device);
static int acpi_pci_root_remove(struct acpi_device *device, int type);
-static int acpi_pci_root_start(struct acpi_device *device);
#define ACPI_PCIE_REQ_SUPPORT (OSC_EXT_PCI_CONFIG_SUPPORT \
| OSC_ACTIVE_STATE_PWR_SUPPORT \
@@ -67,7 +66,6 @@ static struct acpi_driver acpi_pci_root_driver = {
.ops = {
.add = acpi_pci_root_add,
.remove = acpi_pci_root_remove,
- .start = acpi_pci_root_start,
},
};
@@ -623,6 +621,8 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
if (system_state != SYSTEM_BOOTING)
pci_enable_bridges(root->bus);
+ pci_bus_add_devices(root->bus);
+
return 0;
out_del_root:
@@ -634,16 +634,6 @@ end:
return result;
}
-static int acpi_pci_root_start(struct acpi_device *device)
-{
- struct acpi_pci_root *root = acpi_driver_data(device);
-
-
- pci_bus_add_devices(root->bus);
-
- return 0;
-}
-
static int acpi_pci_root_remove(struct acpi_device *device, int type)
{
acpi_status status;
--
1.7.7
next prev parent reply other threads:[~2012-10-02 6:33 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 6:32 [PATCH 00/10] PCI, ACPI: Use bus type notifier for root bus hotplug Yinghai Lu
2012-10-02 6:32 ` [PATCH 01/10] device: add drivers_autoprobe in struct device Yinghai Lu
2012-10-02 13:33 ` Greg Kroah-Hartman
2012-10-02 17:39 ` Yinghai Lu
2012-10-02 17:47 ` Greg Kroah-Hartman
2012-10-02 18:00 ` Bjorn Helgaas
2012-10-02 20:20 ` Yinghai Lu
2012-10-02 20:45 ` Greg Kroah-Hartman
2012-10-02 21:47 ` Yinghai Lu
2012-10-02 22:38 ` Bjorn Helgaas
2012-10-02 23:20 ` Yinghai Lu
2012-10-03 0:00 ` Yinghai Lu
2012-10-03 2:07 ` Yinghai Lu
2012-10-03 2:08 ` Yinghai Lu
2012-10-03 19:48 ` Bjorn Helgaas
2012-10-03 20:50 ` Yinghai Lu
2012-10-03 23:00 ` [PATCH 0/4] ACPI: kill acpi_pci_root_start Yinghai Lu
2012-10-03 23:00 ` [PATCH 1/4] ACPI: add drivers_autoprobe in struct acpi_device Yinghai Lu
2012-10-04 13:03 ` Konrad Rzeszutek Wilk
2012-10-04 15:15 ` Yinghai Lu
2012-10-09 16:38 ` Konrad Rzeszutek Wilk
2012-10-03 23:00 ` [PATCH 2/4] ACPI: use device drivers_autoprobe to delay loading acpi drivers Yinghai Lu
2012-10-03 23:00 ` [PATCH 3/4] PCI, ACPI: Remove not used acpi_pci_root_start() Yinghai Lu
2012-10-03 23:00 ` [PATCH 4/4] ACPI: remove acpi_op_start workaround Yinghai Lu
2012-10-04 12:57 ` Konrad Rzeszutek Wilk
2012-10-04 17:47 ` [PATCH 0/4] ACPI: kill acpi_pci_root_start Bjorn Helgaas
2012-10-04 18:36 ` Yinghai Lu
2012-10-04 19:44 ` Bjorn Helgaas
2012-10-04 19:54 ` Rafael J. Wysocki
2012-10-04 20:14 ` Yinghai Lu
2012-10-04 20:47 ` Bjorn Helgaas
2012-10-04 19:53 ` Rafael J. Wysocki
2012-10-04 21:23 ` Rafael J. Wysocki
2012-10-04 21:31 ` Yinghai Lu
2012-10-04 21:53 ` Rafael J. Wysocki
2012-10-04 22:01 ` Yinghai Lu
2012-10-04 22:36 ` Rafael J. Wysocki
2012-10-04 22:46 ` Yinghai Lu
2012-10-05 23:01 ` Rafael J. Wysocki
2012-10-05 23:10 ` Yinghai Lu
2012-10-08 20:12 ` Rafael J. Wysocki
2012-10-02 6:33 ` [PATCH 02/10] ACPI: use device drivers_autoprobe to delay loading acpi drivers Yinghai Lu
2012-10-02 6:33 ` [PATCH 03/10] PCI: prepare to use device drivers_autoprobe to delay attach drivers Yinghai Lu
2012-10-02 6:33 ` [PATCH 04/10] PCI: Use device_add for device and bus early Yinghai Lu
2012-10-02 6:33 ` [PATCH 05/10] PCI, ACPI: Separate out acpi_pci_root_osc_contorl_set Yinghai Lu
2012-10-02 6:33 ` [PATCH 06/10] PCI, ACPI: Move hot add root bus conf code to acpi_pci_root_add Yinghai Lu
2012-10-02 6:33 ` Yinghai Lu [this message]
2012-10-02 6:33 ` [PATCH 08/10] PCI: Add dev_is_pci_host_bridge() helper Yinghai Lu
2012-10-02 6:33 ` [PATCH 09/10] PCI, ACPI: using acpi/pci bind path for pci_host_bridge Yinghai Lu
2012-10-02 6:33 ` [PATCH 10/10] PCI, ACPI: use bus_type notifier for acpi_pci_bind_notify Yinghai Lu
2012-10-06 2:57 ` [PATCH 00/10] PCI, ACPI: Use bus type notifier for root bus hotplug Jiang Liu
2012-10-06 7:25 ` Yinghai Lu
2012-10-07 15:17 ` Jiang Liu
2012-10-07 22:33 ` Yinghai Lu
2012-10-08 15:23 ` Jiang Liu
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=1349159588-15029-8-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pci@vger.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).