forked from Minki/linux
ACPI: EC: Rearrange code in acpi_ec_submit_event()
Rearange acpi_ec_event_handler() so as to avoid releasing ec->lock and acquiring it again right away in the case when ec_event_clearing is not ACPI_EC_EVT_TIMING_EVENT. This also reduces the number of checks done by acpi_ec_event_handler() in that case. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
54b86141d7
commit
13a62d0e13
@ -1238,6 +1238,7 @@ static void acpi_ec_event_handler(struct work_struct *work)
|
||||
acpi_ec_submit_query(ec);
|
||||
|
||||
spin_lock_irq(&ec->lock);
|
||||
|
||||
ec->events_to_process--;
|
||||
}
|
||||
|
||||
@ -1246,27 +1247,30 @@ static void acpi_ec_event_handler(struct work_struct *work)
|
||||
* event handling work again regardless of whether or not the query
|
||||
* queued up above is processed successfully.
|
||||
*/
|
||||
if (ec_event_clearing == ACPI_EC_EVT_TIMING_EVENT)
|
||||
acpi_ec_complete_event(ec);
|
||||
else
|
||||
acpi_ec_close_event(ec);
|
||||
if (ec_event_clearing == ACPI_EC_EVT_TIMING_EVENT) {
|
||||
bool guard_timeout;
|
||||
|
||||
spin_unlock_irq(&ec->lock);
|
||||
acpi_ec_complete_event(ec);
|
||||
|
||||
ec_dbg_evt("Event stopped");
|
||||
|
||||
if (ec_event_clearing == ACPI_EC_EVT_TIMING_EVENT && ec_guard(ec)) {
|
||||
spin_unlock_irq(&ec->lock);
|
||||
|
||||
guard_timeout = !!ec_guard(ec);
|
||||
|
||||
spin_lock_irq(&ec->lock);
|
||||
|
||||
/* Take care of SCI_EVT unless someone else is doing that. */
|
||||
if (!ec->curr)
|
||||
if (guard_timeout && !ec->curr)
|
||||
advance_transaction(ec, false);
|
||||
} else {
|
||||
acpi_ec_close_event(ec);
|
||||
|
||||
spin_unlock_irq(&ec->lock);
|
||||
ec_dbg_evt("Event stopped");
|
||||
}
|
||||
|
||||
spin_lock_irq(&ec->lock);
|
||||
ec->events_in_progress--;
|
||||
|
||||
spin_unlock_irq(&ec->lock);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user