Patchwork [07/10] PCI, ACPI: Remove not used acpi_pci_root_start()

login
register
mail settings
Submitter Yinghai Lu
Date Oct. 2, 2012, 6:33 a.m.
Message ID <1349159588-15029-8-git-send-email-yinghai@kernel.org>
Download mbox | patch
Permalink /patch/188393/
State Rejected
Headers show

Comments

Yinghai Lu - Oct. 2, 2012, 6:33 a.m.
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(-)

Patch

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;