aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ec.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-10-14 02:23:55 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-20 18:44:54 -0400
commitd3090b6a6cfa6c7a762d6c13340170ca072b2b81 (patch)
treece5d6bb983ea6236ae36a13479680ca693d84229 /drivers/acpi/ec.c
parente34c0e2bb4046d574224de3752642177a45a067a (diff)
ACPI / EC: Refine event/query debugging messages.
This patch refines event/query debugging messages to use a unified format as commands. Developers can clearly find different processes by checking different log seperators. No functional changes. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r--drivers/acpi/ec.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index fcf667c3961e..d0247d38d96f 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -332,8 +332,10 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
332 spin_unlock_irqrestore(&ec->lock, tmp); 332 spin_unlock_irqrestore(&ec->lock, tmp);
333 ret = ec_poll(ec); 333 ret = ec_poll(ec);
334 spin_lock_irqsave(&ec->lock, tmp); 334 spin_lock_irqsave(&ec->lock, tmp);
335 if (ec->curr->command == ACPI_EC_COMMAND_QUERY) 335 if (ec->curr->command == ACPI_EC_COMMAND_QUERY) {
336 clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags); 336 clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
337 pr_debug("***** Event stopped *****\n");
338 }
337 pr_debug("***** Command(%s) stopped *****\n", 339 pr_debug("***** Command(%s) stopped *****\n",
338 acpi_ec_cmd_string(t->command)); 340 acpi_ec_cmd_string(t->command));
339 ec->curr = NULL; 341 ec->curr = NULL;
@@ -617,12 +619,12 @@ static void acpi_ec_run(void *cxt)
617 struct acpi_ec_query_handler *handler = cxt; 619 struct acpi_ec_query_handler *handler = cxt;
618 if (!handler) 620 if (!handler)
619 return; 621 return;
620 pr_debug("start query execution\n"); 622 pr_debug("##### Query(0x%02x) started #####\n", handler->query_bit);
621 if (handler->func) 623 if (handler->func)
622 handler->func(handler->data); 624 handler->func(handler->data);
623 else if (handler->handle) 625 else if (handler->handle)
624 acpi_evaluate_object(handler->handle, NULL, NULL, NULL); 626 acpi_evaluate_object(handler->handle, NULL, NULL, NULL);
625 pr_debug("stop query execution\n"); 627 pr_debug("##### Query(0x%02x) stopped #####\n", handler->query_bit);
626 kfree(handler); 628 kfree(handler);
627} 629}
628 630
@@ -645,8 +647,8 @@ static int acpi_ec_sync_query(struct acpi_ec *ec, u8 *data)
645 if (!copy) 647 if (!copy)
646 return -ENOMEM; 648 return -ENOMEM;
647 memcpy(copy, handler, sizeof(*copy)); 649 memcpy(copy, handler, sizeof(*copy));
648 pr_debug("push query execution (0x%2x) on queue\n", 650 pr_debug("##### Query(0x%02x) scheduled #####\n",
649 value); 651 handler->query_bit);
650 return acpi_os_execute((copy->func) ? 652 return acpi_os_execute((copy->func) ?
651 OSL_NOTIFY_HANDLER : OSL_GPE_HANDLER, 653 OSL_NOTIFY_HANDLER : OSL_GPE_HANDLER,
652 acpi_ec_run, copy); 654 acpi_ec_run, copy);
@@ -669,7 +671,7 @@ static int ec_check_sci(struct acpi_ec *ec, u8 state)
669{ 671{
670 if (state & ACPI_EC_FLAG_SCI) { 672 if (state & ACPI_EC_FLAG_SCI) {
671 if (!test_and_set_bit(EC_FLAGS_QUERY_PENDING, &ec->flags)) { 673 if (!test_and_set_bit(EC_FLAGS_QUERY_PENDING, &ec->flags)) {
672 pr_debug("push gpe query to the queue\n"); 674 pr_debug("***** Event started *****\n");
673 return acpi_os_execute(OSL_NOTIFY_HANDLER, 675 return acpi_os_execute(OSL_NOTIFY_HANDLER,
674 acpi_ec_gpe_query, ec); 676 acpi_ec_gpe_query, ec);
675 } 677 }