---

yaml --- r: 154156 b: refs/heads/master c: caf420c h: refs/heads/master v: v3
git-mirror · Jun 20, 2009 · a05801b · a05801b
1 parent ec246ff
commit a05801b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5eebbe119a861b5e4f5c67c886eab0937c686ed
+refs/heads/master: caf420c68afe01acd7c458ce40b85b3db5330ff5
diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c
@@ -497,30 +497,17 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
 
 static int acpi_pci_root_start(struct acpi_device *device)
 {
-	struct acpi_pci_root *root;
-
+	struct acpi_pci_root *root = acpi_driver_data(device);
 
-	list_for_each_entry(root, &acpi_pci_roots, node) {
-		if (root->device == device) {
-			pci_bus_add_devices(root->bus);
-			return 0;
-		}
-	}
-	return -ENODEV;
+	pci_bus_add_devices(root->bus);
+	return 0;
 }
 
 static int acpi_pci_root_remove(struct acpi_device *device, int type)
 {
-	struct acpi_pci_root *root = NULL;
-
-
-	if (!device || !acpi_driver_data(device))
-		return -EINVAL;
-
-	root = acpi_driver_data(device);
+	struct acpi_pci_root *root = acpi_driver_data(device);
 
 	kfree(root);
-
 	return 0;
 }