diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-23 19:42:02 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-12-01 20:17:32 +0100 |
commit | eafe7509ab8c8a200a169bc378fc9a56164acc66 (patch) | |
tree | 6fa2ad7e269c3e6bd5a0ed5525f2a2bd6d7bd883 /drivers/acpi/ec.c | |
parent | ACPI: EC: Simplify locking in acpi_ec_event_handler() (diff) | |
download | linux-eafe7509ab8c8a200a169bc378fc9a56164acc66.tar.xz linux-eafe7509ab8c8a200a169bc378fc9a56164acc66.zip |
ACPI: EC: Rename three functions
Rename acpi_ec_submit_query() to acpi_ec_submit_event(),
acpi_ec_query() to acpi_ec_submit_query(), and
acpi_ec_complete_query() to acpi_ec_close_event() to make
the names reflect what the functions do.
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.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 6fbd8521b901..473b1d8617b5 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -169,7 +169,7 @@ struct acpi_ec_query { struct acpi_ec *ec; }; -static int acpi_ec_query(struct acpi_ec *ec); +static int acpi_ec_submit_query(struct acpi_ec *ec); static bool advance_transaction(struct acpi_ec *ec, bool interrupt); static void acpi_ec_event_handler(struct work_struct *work); static void acpi_ec_event_processor(struct work_struct *work); @@ -444,7 +444,7 @@ static bool acpi_ec_submit_flushable_request(struct acpi_ec *ec) return true; } -static bool acpi_ec_submit_query(struct acpi_ec *ec) +static bool acpi_ec_submit_event(struct acpi_ec *ec) { acpi_ec_mask_events(ec); if (!acpi_ec_event_enabled(ec)) @@ -465,7 +465,7 @@ static bool acpi_ec_submit_query(struct acpi_ec *ec) return true; } -static void acpi_ec_complete_query(struct acpi_ec *ec) +static void acpi_ec_close_event(struct acpi_ec *ec) { if (test_and_clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags)) ec_dbg_evt("Command(%s) unblocked", @@ -499,7 +499,7 @@ static void acpi_ec_clear(struct acpi_ec *ec) int i; for (i = 0; i < ACPI_EC_CLEAR_MAX; i++) { - if (acpi_ec_query(ec)) + if (acpi_ec_submit_query(ec)) break; } if (unlikely(i == ACPI_EC_CLEAR_MAX)) @@ -613,10 +613,10 @@ static inline void ec_transaction_transition(struct acpi_ec *ec, unsigned long f if (ec->curr->command == ACPI_EC_COMMAND_QUERY) { if (ec_event_clearing == ACPI_EC_EVT_TIMING_STATUS && flag == ACPI_EC_COMMAND_POLL) - acpi_ec_complete_query(ec); + acpi_ec_close_event(ec); if (ec_event_clearing == ACPI_EC_EVT_TIMING_QUERY && flag == ACPI_EC_COMMAND_COMPLETE) - acpi_ec_complete_query(ec); + acpi_ec_close_event(ec); if (ec_event_clearing == ACPI_EC_EVT_TIMING_EVENT && flag == ACPI_EC_COMMAND_COMPLETE) set_bit(EC_FLAGS_QUERY_GUARDING, &ec->flags); @@ -668,7 +668,7 @@ static bool advance_transaction(struct acpi_ec *ec, bool interrupt) (!ec->nr_pending_queries || test_bit(EC_FLAGS_QUERY_GUARDING, &ec->flags))) { clear_bit(EC_FLAGS_QUERY_GUARDING, &ec->flags); - acpi_ec_complete_query(ec); + acpi_ec_close_event(ec); } if (!t) goto out; @@ -704,7 +704,7 @@ static bool advance_transaction(struct acpi_ec *ec, bool interrupt) out: if (status & ACPI_EC_FLAG_SCI) - ret = acpi_ec_submit_query(ec); + ret = acpi_ec_submit_event(ec); if (wakeup && interrupt) wake_up(&ec->wait); @@ -1162,7 +1162,7 @@ static void acpi_ec_event_processor(struct work_struct *work) acpi_ec_delete_query(q); } -static int acpi_ec_query(struct acpi_ec *ec) +static int acpi_ec_submit_query(struct acpi_ec *ec) { struct acpi_ec_query *q; u8 value = 0; @@ -1226,7 +1226,7 @@ static void acpi_ec_event_handler(struct work_struct *work) while (ec->nr_pending_queries) { spin_unlock_irq(&ec->lock); - acpi_ec_query(ec); + acpi_ec_submit_query(ec); spin_lock_irq(&ec->lock); ec->nr_pending_queries--; @@ -1239,7 +1239,7 @@ static void acpi_ec_event_handler(struct work_struct *work) */ if (ec_event_clearing == ACPI_EC_EVT_TIMING_STATUS || ec_event_clearing == ACPI_EC_EVT_TIMING_QUERY) - acpi_ec_complete_query(ec); + acpi_ec_close_event(ec); spin_unlock_irq(&ec->lock); |