@@ -169,7 +169,7 @@ struct acpi_ec_query {
169169 struct acpi_ec * ec ;
170170};
171171
172- static int acpi_ec_query (struct acpi_ec * ec );
172+ static int acpi_ec_submit_query (struct acpi_ec * ec );
173173static bool advance_transaction (struct acpi_ec * ec , bool interrupt );
174174static void acpi_ec_event_handler (struct work_struct * work );
175175static void acpi_ec_event_processor (struct work_struct * work );
@@ -444,7 +444,7 @@ static bool acpi_ec_submit_flushable_request(struct acpi_ec *ec)
444444 return true;
445445}
446446
447- static bool acpi_ec_submit_query (struct acpi_ec * ec )
447+ static bool acpi_ec_submit_event (struct acpi_ec * ec )
448448{
449449 acpi_ec_mask_events (ec );
450450 if (!acpi_ec_event_enabled (ec ))
@@ -465,7 +465,7 @@ static bool acpi_ec_submit_query(struct acpi_ec *ec)
465465 return true;
466466}
467467
468- static void acpi_ec_complete_query (struct acpi_ec * ec )
468+ static void acpi_ec_close_event (struct acpi_ec * ec )
469469{
470470 if (test_and_clear_bit (EC_FLAGS_QUERY_PENDING , & ec -> flags ))
471471 ec_dbg_evt ("Command(%s) unblocked" ,
@@ -499,7 +499,7 @@ static void acpi_ec_clear(struct acpi_ec *ec)
499499 int i ;
500500
501501 for (i = 0 ; i < ACPI_EC_CLEAR_MAX ; i ++ ) {
502- if (acpi_ec_query (ec ))
502+ if (acpi_ec_submit_query (ec ))
503503 break ;
504504 }
505505 if (unlikely (i == ACPI_EC_CLEAR_MAX ))
@@ -613,10 +613,10 @@ static inline void ec_transaction_transition(struct acpi_ec *ec, unsigned long f
613613 if (ec -> curr -> command == ACPI_EC_COMMAND_QUERY ) {
614614 if (ec_event_clearing == ACPI_EC_EVT_TIMING_STATUS &&
615615 flag == ACPI_EC_COMMAND_POLL )
616- acpi_ec_complete_query (ec );
616+ acpi_ec_close_event (ec );
617617 if (ec_event_clearing == ACPI_EC_EVT_TIMING_QUERY &&
618618 flag == ACPI_EC_COMMAND_COMPLETE )
619- acpi_ec_complete_query (ec );
619+ acpi_ec_close_event (ec );
620620 if (ec_event_clearing == ACPI_EC_EVT_TIMING_EVENT &&
621621 flag == ACPI_EC_COMMAND_COMPLETE )
622622 set_bit (EC_FLAGS_QUERY_GUARDING , & ec -> flags );
@@ -668,7 +668,7 @@ static bool advance_transaction(struct acpi_ec *ec, bool interrupt)
668668 (!ec -> nr_pending_queries ||
669669 test_bit (EC_FLAGS_QUERY_GUARDING , & ec -> flags ))) {
670670 clear_bit (EC_FLAGS_QUERY_GUARDING , & ec -> flags );
671- acpi_ec_complete_query (ec );
671+ acpi_ec_close_event (ec );
672672 }
673673 if (!t )
674674 goto out ;
@@ -704,7 +704,7 @@ static bool advance_transaction(struct acpi_ec *ec, bool interrupt)
704704
705705out :
706706 if (status & ACPI_EC_FLAG_SCI )
707- ret = acpi_ec_submit_query (ec );
707+ ret = acpi_ec_submit_event (ec );
708708
709709 if (wakeup && interrupt )
710710 wake_up (& ec -> wait );
@@ -1162,7 +1162,7 @@ static void acpi_ec_event_processor(struct work_struct *work)
11621162 acpi_ec_delete_query (q );
11631163}
11641164
1165- static int acpi_ec_query (struct acpi_ec * ec )
1165+ static int acpi_ec_submit_query (struct acpi_ec * ec )
11661166{
11671167 struct acpi_ec_query * q ;
11681168 u8 value = 0 ;
@@ -1226,7 +1226,7 @@ static void acpi_ec_event_handler(struct work_struct *work)
12261226 while (ec -> nr_pending_queries ) {
12271227 spin_unlock_irq (& ec -> lock );
12281228
1229- acpi_ec_query (ec );
1229+ acpi_ec_submit_query (ec );
12301230
12311231 spin_lock_irq (& ec -> lock );
12321232 ec -> nr_pending_queries -- ;
@@ -1239,7 +1239,7 @@ static void acpi_ec_event_handler(struct work_struct *work)
12391239 */
12401240 if (ec_event_clearing == ACPI_EC_EVT_TIMING_STATUS ||
12411241 ec_event_clearing == ACPI_EC_EVT_TIMING_QUERY )
1242- acpi_ec_complete_query (ec );
1242+ acpi_ec_close_event (ec );
12431243
12441244 spin_unlock_irq (& ec -> lock );
12451245
0 commit comments