summaryrefslogtreecommitdiff
path: root/drivers/acpi/ec.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-11-23 21:40:50 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-12-01 22:17:32 +0300
commita105acd7e38436ed6bc0714f3120aaaad56cbe3d (patch)
tree40a08fbc15eced33697ebbe8256e6d5bdaa198f9 /drivers/acpi/ec.c
parent388fb77dcf9793b9882e0f0651019f416ef50900 (diff)
downloadlinux-a105acd7e38436ed6bc0714f3120aaaad56cbe3d.tar.xz
ACPI: EC: Simplify locking in acpi_ec_event_handler()
Because acpi_ec_event_handler() is a work function, it always runs in process context with interrupts enabled, so it can use spin_lock_irq() and spin_unlock_irq() for the locking. Make it do so and adjust white space around those calls. No expected functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r--drivers/acpi/ec.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 7582ef59b81f..6fbd8521b901 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1217,18 +1217,18 @@ err_exit:
static void acpi_ec_event_handler(struct work_struct *work)
{
- unsigned long flags;
struct acpi_ec *ec = container_of(work, struct acpi_ec, work);
ec_dbg_evt("Event started");
- spin_lock_irqsave(&ec->lock, flags);
+ spin_lock_irq(&ec->lock);
+
while (ec->nr_pending_queries) {
- spin_unlock_irqrestore(&ec->lock, flags);
+ spin_unlock_irq(&ec->lock);
acpi_ec_query(ec);
- spin_lock_irqsave(&ec->lock, flags);
+ spin_lock_irq(&ec->lock);
ec->nr_pending_queries--;
}
@@ -1241,23 +1241,23 @@ static void acpi_ec_event_handler(struct work_struct *work)
ec_event_clearing == ACPI_EC_EVT_TIMING_QUERY)
acpi_ec_complete_query(ec);
- spin_unlock_irqrestore(&ec->lock, flags);
+ spin_unlock_irq(&ec->lock);
ec_dbg_evt("Event stopped");
if (ec_event_clearing == ACPI_EC_EVT_TIMING_EVENT && ec_guard(ec)) {
- spin_lock_irqsave(&ec->lock, flags);
+ spin_lock_irq(&ec->lock);
/* Take care of SCI_EVT unless someone else is doing that. */
if (!ec->curr)
advance_transaction(ec, false);
- spin_unlock_irqrestore(&ec->lock, flags);
+ spin_unlock_irq(&ec->lock);
}
- spin_lock_irqsave(&ec->lock, flags);
+ spin_lock_irq(&ec->lock);
ec->events_in_progress--;
- spin_unlock_irqrestore(&ec->lock, flags);
+ spin_unlock_irq(&ec->lock);
}
static void acpi_ec_handle_interrupt(struct acpi_ec *ec)