diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2007-05-29 08:42:57 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-06-23 15:55:06 -0400 |
commit | 4350933a7447591041b51157a6b307be1816415f (patch) | |
tree | edcb0ba9161c18e24efcc1f027dbe20dc40723fe /drivers/acpi/ec.c | |
parent | 5b7734b440d29dab583a6c3f0ee49ff20f323332 (diff) |
ACPI EC: drop usage of ACPI_DEBUG_PRINT as too heavy weight
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r-- | drivers/acpi/ec.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 5534b234509b..ffb8361bc1bf 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -39,20 +39,19 @@ | |||
39 | #include <acpi/acpi_drivers.h> | 39 | #include <acpi/acpi_drivers.h> |
40 | #include <acpi/actypes.h> | 40 | #include <acpi/actypes.h> |
41 | 41 | ||
42 | #define _COMPONENT ACPI_EC_COMPONENT | ||
43 | ACPI_MODULE_NAME("ec"); | ||
44 | #define ACPI_EC_COMPONENT 0x00100000 | ||
45 | #define ACPI_EC_CLASS "embedded_controller" | 42 | #define ACPI_EC_CLASS "embedded_controller" |
46 | #define ACPI_EC_HID "PNP0C09" | 43 | #define ACPI_EC_HID "PNP0C09" |
47 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" | 44 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" |
48 | #define ACPI_EC_FILE_INFO "info" | 45 | #define ACPI_EC_FILE_INFO "info" |
49 | #undef PREFIX | 46 | #undef PREFIX |
50 | #define PREFIX "ACPI: EC: " | 47 | #define PREFIX "ACPI: EC: " |
48 | |||
51 | /* EC status register */ | 49 | /* EC status register */ |
52 | #define ACPI_EC_FLAG_OBF 0x01 /* Output buffer full */ | 50 | #define ACPI_EC_FLAG_OBF 0x01 /* Output buffer full */ |
53 | #define ACPI_EC_FLAG_IBF 0x02 /* Input buffer full */ | 51 | #define ACPI_EC_FLAG_IBF 0x02 /* Input buffer full */ |
54 | #define ACPI_EC_FLAG_BURST 0x10 /* burst mode */ | 52 | #define ACPI_EC_FLAG_BURST 0x10 /* burst mode */ |
55 | #define ACPI_EC_FLAG_SCI 0x20 /* EC-SCI occurred */ | 53 | #define ACPI_EC_FLAG_SCI 0x20 /* EC-SCI occurred */ |
54 | |||
56 | /* EC commands */ | 55 | /* EC commands */ |
57 | enum ec_command { | 56 | enum ec_command { |
58 | ACPI_EC_COMMAND_READ = 0x80, | 57 | ACPI_EC_COMMAND_READ = 0x80, |
@@ -245,7 +244,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command, | |||
245 | 244 | ||
246 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0, 0); | 245 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0, 0); |
247 | if (status) { | 246 | if (status) { |
248 | printk(KERN_DEBUG PREFIX | 247 | printk(KERN_ERR PREFIX |
249 | "input buffer is not empty, aborting transaction\n"); | 248 | "input buffer is not empty, aborting transaction\n"); |
250 | goto end; | 249 | goto end; |
251 | } | 250 | } |
@@ -630,10 +629,6 @@ static int acpi_ec_add(struct acpi_device *device) | |||
630 | 629 | ||
631 | acpi_ec_add_fs(device); | 630 | acpi_ec_add_fs(device); |
632 | 631 | ||
633 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s [%s] (gpe %d) interrupt mode.", | ||
634 | acpi_device_name(device), acpi_device_bid(device), | ||
635 | (u32) ec->gpe)); | ||
636 | |||
637 | return 0; | 632 | return 0; |
638 | } | 633 | } |
639 | 634 | ||
@@ -718,9 +713,6 @@ static int acpi_ec_start(struct acpi_device *device) | |||
718 | if (!ec) | 713 | if (!ec) |
719 | return -EINVAL; | 714 | return -EINVAL; |
720 | 715 | ||
721 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "gpe=0x%02lx, ports=0x%2lx,0x%2lx", | ||
722 | ec->gpe, ec->command_addr, ec->data_addr)); | ||
723 | |||
724 | /* Boot EC is already working */ | 716 | /* Boot EC is already working */ |
725 | if (ec == boot_ec) | 717 | if (ec == boot_ec) |
726 | return 0; | 718 | return 0; |
@@ -779,8 +771,8 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) | |||
779 | 771 | ||
780 | ec->handle = handle; | 772 | ec->handle = handle; |
781 | 773 | ||
782 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "GPE=0x%02lx, ports=0x%2lx, 0x%2lx", | 774 | printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx", |
783 | ec->gpe, ec->command_addr, ec->data_addr)); | 775 | ec->gpe, ec->command_addr, ec->data_addr); |
784 | 776 | ||
785 | return AE_CTRL_TERMINATE; | 777 | return AE_CTRL_TERMINATE; |
786 | } | 778 | } |
@@ -803,7 +795,7 @@ int __init acpi_ec_ecdt_probe(void) | |||
803 | if (ACPI_FAILURE(status)) | 795 | if (ACPI_FAILURE(status)) |
804 | goto error; | 796 | goto error; |
805 | 797 | ||
806 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found ECDT")); | 798 | printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n"); |
807 | 799 | ||
808 | boot_ec->command_addr = ecdt_ptr->control.address; | 800 | boot_ec->command_addr = ecdt_ptr->control.address; |
809 | boot_ec->data_addr = ecdt_ptr->data.address; | 801 | boot_ec->data_addr = ecdt_ptr->data.address; |