Merge back earlier acpi-hotplug material.

Rafael J. Wysocki
2 parents 6ce4eac1f6 ca499fc87e
Showing 3 changed files Side-by-side Diff
drivers/acpi/pci_root.c
drivers/acpi/scan.c
include/acpi/acpi_bus.h
@@ -65,6 +65,9 @@
 	.ids = root_device_ids,
 	.attach = acpi_pci_root_add,
 	.detach = acpi_pci_root_remove,
+	.hotplug = {
+		.ignore = true,
+	},
 };
  
 static DEFINE_MUTEX(osc_lock);
@@ -1772,7 +1772,7 @@
 	 */
 	list_for_each_entry(hwid, &pnp.ids, list) {
 		handler = acpi_scan_match_handler(hwid->id, NULL);
-		if (handler) {
+		if (handler && !handler->hotplug.ignore) {
 			acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
 					acpi_hotplug_notify_cb, handler);
 			break;
@@ -100,6 +100,7 @@
 struct acpi_hotplug_profile {
 	struct kobject kobj;
 	bool enabled:1;
+	bool ignore:1;
 	enum acpi_hotplug_mode mode;
 };
...	...	@@ -65,6 +65,9 @@
65	65	.ids = root_device_ids,
66	66	.attach = acpi_pci_root_add,
67	67	.detach = acpi_pci_root_remove,
	68	+ .hotplug = {
	69	+ .ignore = true,
	70	+ },
68	71	};
69	72
70	73	static DEFINE_MUTEX(osc_lock);
...	...	@@ -1772,7 +1772,7 @@
1772	1772	*/
1773	1773	list_for_each_entry(hwid, &pnp.ids, list) {
1774	1774	handler = acpi_scan_match_handler(hwid->id, NULL);
1775		- if (handler) {
	1775	+ if (handler && !handler->hotplug.ignore) {
1776	1776	acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
1777	1777	acpi_hotplug_notify_cb, handler);
1778	1778	break;
...	...	@@ -100,6 +100,7 @@
100	100	struct acpi_hotplug_profile {
101	101	struct kobject kobj;
102	102	bool enabled:1;
	103	+ bool ignore:1;
103	104	enum acpi_hotplug_mode mode;
104	105	};
105	106