diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/ec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index d4366ad4edcd..93fcaec6d589 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -279,7 +279,7 @@ int acpi_ec_enter_burst_mode(union acpi_ec *ec) | |||
279 | atomic_set(&ec->intr.leaving_burst, 0); | 279 | atomic_set(&ec->intr.leaving_burst, 0); |
280 | return_VALUE(0); | 280 | return_VALUE(0); |
281 | end: | 281 | end: |
282 | printk("Error in acpi_ec_wait\n"); | 282 | printk(KERN_WARNING PREFIX "Error in acpi_ec_wait\n"); |
283 | return_VALUE(-1); | 283 | return_VALUE(-1); |
284 | } | 284 | } |
285 | 285 | ||
@@ -300,7 +300,7 @@ int acpi_ec_leave_burst_mode(union acpi_ec *ec) | |||
300 | atomic_set(&ec->intr.leaving_burst, 1); | 300 | atomic_set(&ec->intr.leaving_burst, 1); |
301 | return_VALUE(0); | 301 | return_VALUE(0); |
302 | end: | 302 | end: |
303 | printk("leave burst_mode:error \n"); | 303 | printk(KERN_WARNING PREFIX "leave burst_mode:error\n"); |
304 | return_VALUE(-1); | 304 | return_VALUE(-1); |
305 | } | 305 | } |
306 | #endif /* ACPI_FUTURE_USAGE */ | 306 | #endif /* ACPI_FUTURE_USAGE */ |
@@ -437,20 +437,20 @@ static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data) | |||
437 | 437 | ||
438 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); | 438 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); |
439 | if (status) { | 439 | if (status) { |
440 | printk("read EC, IB not empty\n"); | 440 | printk(KERN_DEBUG PREFIX "read EC, IB not empty\n"); |
441 | goto end; | 441 | goto end; |
442 | } | 442 | } |
443 | acpi_hw_low_level_write(8, ACPI_EC_COMMAND_READ, | 443 | acpi_hw_low_level_write(8, ACPI_EC_COMMAND_READ, |
444 | &ec->common.command_addr); | 444 | &ec->common.command_addr); |
445 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); | 445 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); |
446 | if (status) { | 446 | if (status) { |
447 | printk("read EC, IB not empty\n"); | 447 | printk(KERN_DEBUG PREFIX "read EC, IB not empty\n"); |
448 | } | 448 | } |
449 | 449 | ||
450 | acpi_hw_low_level_write(8, address, &ec->common.data_addr); | 450 | acpi_hw_low_level_write(8, address, &ec->common.data_addr); |
451 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF); | 451 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF); |
452 | if (status) { | 452 | if (status) { |
453 | printk("read EC, OB not full\n"); | 453 | printk(KERN_DEBUG PREFIX "read EC, OB not full\n"); |
454 | goto end; | 454 | goto end; |
455 | } | 455 | } |
456 | acpi_hw_low_level_read(8, data, &ec->common.data_addr); | 456 | acpi_hw_low_level_read(8, data, &ec->common.data_addr); |
@@ -487,19 +487,19 @@ static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data) | |||
487 | 487 | ||
488 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); | 488 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); |
489 | if (status) { | 489 | if (status) { |
490 | printk("write EC, IB not empty\n"); | 490 | printk(KERN_DEBUG PREFIX "write EC, IB not empty\n"); |
491 | } | 491 | } |
492 | acpi_hw_low_level_write(8, ACPI_EC_COMMAND_WRITE, | 492 | acpi_hw_low_level_write(8, ACPI_EC_COMMAND_WRITE, |
493 | &ec->common.command_addr); | 493 | &ec->common.command_addr); |
494 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); | 494 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); |
495 | if (status) { | 495 | if (status) { |
496 | printk("write EC, IB not empty\n"); | 496 | printk(KERN_DEBUG PREFIX "write EC, IB not empty\n"); |
497 | } | 497 | } |
498 | 498 | ||
499 | acpi_hw_low_level_write(8, address, &ec->common.data_addr); | 499 | acpi_hw_low_level_write(8, address, &ec->common.data_addr); |
500 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); | 500 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); |
501 | if (status) { | 501 | if (status) { |
502 | printk("write EC, IB not empty\n"); | 502 | printk(KERN_DEBUG PREFIX "write EC, IB not empty\n"); |
503 | } | 503 | } |
504 | 504 | ||
505 | acpi_hw_low_level_write(8, data, &ec->common.data_addr); | 505 | acpi_hw_low_level_write(8, data, &ec->common.data_addr); |
@@ -630,7 +630,7 @@ static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data) | |||
630 | 630 | ||
631 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); | 631 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE); |
632 | if (status) { | 632 | if (status) { |
633 | printk("query EC, IB not empty\n"); | 633 | printk(KERN_DEBUG PREFIX "query EC, IB not empty\n"); |
634 | goto end; | 634 | goto end; |
635 | } | 635 | } |
636 | /* | 636 | /* |
@@ -642,7 +642,7 @@ static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data) | |||
642 | &ec->common.command_addr); | 642 | &ec->common.command_addr); |
643 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF); | 643 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF); |
644 | if (status) { | 644 | if (status) { |
645 | printk("query EC, OB not full\n"); | 645 | printk(KERN_DEBUG PREFIX "query EC, OB not full\n"); |
646 | goto end; | 646 | goto end; |
647 | } | 647 | } |
648 | 648 | ||