===================================================================
@@ -345,47 +345,7 @@ static void acpi_bus_notify(acpi_handle
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Notification %#02x to handle %p\n",
type, handle));
- switch (type) {
-
- case ACPI_NOTIFY_BUS_CHECK:
- /* TBD */
- break;
-
- case ACPI_NOTIFY_DEVICE_CHECK:
- /* TBD */
- break;
-
- case ACPI_NOTIFY_DEVICE_WAKE:
- /* TBD */
- break;
-
- case ACPI_NOTIFY_EJECT_REQUEST:
- /* TBD */
- break;
-
- case ACPI_NOTIFY_DEVICE_CHECK_LIGHT:
- /* TBD: Exactly what does 'light' mean? */
- break;
-
- case ACPI_NOTIFY_FREQUENCY_MISMATCH:
- /* TBD */
- break;
-
- case ACPI_NOTIFY_BUS_MODE_MISMATCH:
- /* TBD */
- break;
-
- case ACPI_NOTIFY_POWER_FAULT:
- /* TBD */
- break;
-
- default:
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "Received unknown/unsupported notification [%08x]\n",
- type));
- break;
- }
-
+ acpi_system_notify(handle, type);
acpi_bus_get_device(handle, &device);
if (device) {
driver = device->driver;
===================================================================
@@ -74,6 +74,7 @@ static inline void acpi_lpss_init(void)
bool acpi_queue_hotplug_work(struct work_struct *work);
bool acpi_scan_is_offline(struct acpi_device *adev, bool uevent);
+void acpi_system_notify(acpi_handle handle, u32 type);
/* --------------------------------------------------------------------------
Device Node Initialization / Removal
===================================================================
@@ -485,11 +485,10 @@ static void acpi_device_hotplug(void *da
unlock_device_hotplug();
}
-static void acpi_hotplug_notify_cb(acpi_handle handle, u32 type, void *data)
+void acpi_system_notify(acpi_handle handle, u32 type)
{
u32 ost_code = ACPI_OST_SC_SUCCESS;
struct acpi_device *adev;
- acpi_status status;
switch (type) {
case ACPI_NOTIFY_BUS_CHECK:
@@ -543,30 +542,25 @@ static void acpi_hotplug_notify_cb(acpi_
acpi_evaluate_hotplug_ost(handle, ACPI_NOTIFY_EJECT_REQUEST,
ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
}
- get_device(&adev->dev);
- mutex_unlock(&acpi_scan_lock);
- status = acpi_hotplug_execute(acpi_device_hotplug, adev, type);
- if (ACPI_SUCCESS(status))
- return;
+ if (adev->handler || (adev->hp && adev->hp->event)) {
+ acpi_status status;
- put_device(&adev->dev);
+ get_device(&adev->dev);
+ mutex_unlock(&acpi_scan_lock);
+ status = acpi_hotplug_execute(acpi_device_hotplug, adev, type);
+ if (ACPI_SUCCESS(status))
+ return;
+
+ put_device(&adev->dev);
+ } else {
+ mutex_unlock(&acpi_scan_lock);
+ return;
+ }
out:
acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
}
-void acpi_install_hotplug_notify_handler(acpi_handle handle)
-{
- acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
- acpi_hotplug_notify_cb, NULL);
-}
-
-void acpi_remove_hotplug_notify_handler(acpi_handle handle)
-{
- acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
- acpi_hotplug_notify_cb);
-}
-
static ssize_t real_power_state_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -1986,34 +1980,6 @@ void acpi_scan_hotplug_enabled(struct ac
mutex_unlock(&acpi_scan_lock);
}
-static void acpi_scan_init_hotplug(acpi_handle handle, int type)
-{
- struct acpi_device_pnp pnp = {};
- struct acpi_hardware_id *hwid;
- struct acpi_scan_handler *handler;
-
- INIT_LIST_HEAD(&pnp.ids);
- acpi_set_pnp_ids(handle, &pnp, type);
-
- if (!pnp.type.hardware_id)
- goto out;
-
- /*
- * This relies on the fact that acpi_install_notify_handler() will not
- * install the same notify handler routine twice for the same handle.
- */
- list_for_each_entry(hwid, &pnp.ids, list) {
- handler = acpi_scan_match_handler(hwid->id, NULL);
- if (handler) {
- acpi_install_hotplug_notify_handler(handle);
- break;
- }
- }
-
-out:
- acpi_free_pnp_ids(&pnp);
-}
-
static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
void *not_used, void **return_value)
{
@@ -2035,8 +2001,6 @@ static acpi_status acpi_bus_check_add(ac
return AE_OK;
}
- acpi_scan_init_hotplug(handle, type);
-
acpi_add_single_object(&device, handle, type, sta);
if (!device)
return AE_CTRL_DEPTH;
===================================================================
@@ -292,7 +292,6 @@ static acpi_status register_slot(acpi_ha
newfunc = &context->func;
newfunc->function = function;
newfunc->parent = bridge;
- mutex_unlock(&acpiphp_context_lock);
if (acpi_has_method(handle, "_EJ0"))
newfunc->flags = FUNC_HAS_EJ0;
@@ -300,8 +299,14 @@ static acpi_status register_slot(acpi_ha
if (acpi_has_method(handle, "_STA"))
newfunc->flags |= FUNC_HAS_STA;
+ /*
+ * Dock stations' notify handler should be used for dock devices instead
+ * of the common one, so clear hp.event in their contexts.
+ */
if (acpi_has_method(handle, "_DCK"))
- newfunc->flags |= FUNC_HAS_DCK;
+ context->hp.event = NULL;
+
+ mutex_unlock(&acpiphp_context_lock);
/* search for objects that share the same slot */
list_for_each_entry(slot, &bridge->slots, node)
@@ -369,10 +374,6 @@ static acpi_status register_slot(acpi_ha
pr_debug("failed to register dock device\n");
}
- /* install notify handler */
- if (!(newfunc->flags & FUNC_HAS_DCK))
- acpi_install_hotplug_notify_handler(handle);
-
return AE_OK;
}
@@ -409,9 +410,6 @@ static void cleanup_bridge(struct acpiph
if (is_dock_device(handle))
unregister_hotplug_dock_device(handle);
-
- if (!(func->flags & FUNC_HAS_DCK))
- acpi_remove_hotplug_notify_handler(handle);
}
slot->flags |= SLOT_IS_GOING_AWAY;
if (slot->slot)
===================================================================
@@ -435,8 +435,6 @@ static inline bool acpi_device_enumerate
typedef void (*acpi_hp_callback)(void *data, u32 src);
acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src);
-void acpi_install_hotplug_notify_handler(acpi_handle handle);
-void acpi_remove_hotplug_notify_handler(acpi_handle handle);
/**
* module_acpi_driver(acpi_driver) - Helper macro for registering an ACPI driver
===================================================================
@@ -167,7 +167,6 @@ struct acpiphp_attention_info
#define FUNC_HAS_STA (0x00000001)
#define FUNC_HAS_EJ0 (0x00000002)
-#define FUNC_HAS_DCK (0x00000004)
/* function prototypes */