Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19519
b: refs/heads/master
c: 1e8df53
h: refs/heads/master
i:
  19517: 7bff613
  19515: 9b06d38
  19511: cc1c684
  19503: 65a3415
  19487: 3de817d
  19455: 817dcf0
v: v3
  • Loading branch information
Len Brown committed Dec 5, 2005
1 parent fea7737 commit 0a174a6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53f11d4ff8797bcceaf014e62bd39f16ce84baec
refs/heads/master: 1e8df53c925024548cca4374f03bed1a7e2b0c45
20 changes: 10 additions & 10 deletions trunk/drivers/acpi/ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ int acpi_ec_enter_burst_mode(union acpi_ec *ec)
atomic_set(&ec->intr.leaving_burst, 0);
return_VALUE(0);
end:
printk("Error in acpi_ec_wait\n");
printk(KERN_WARNING PREFIX "Error in acpi_ec_wait\n");
return_VALUE(-1);
}

Expand All @@ -300,7 +300,7 @@ int acpi_ec_leave_burst_mode(union acpi_ec *ec)
atomic_set(&ec->intr.leaving_burst, 1);
return_VALUE(0);
end:
printk("leave burst_mode:error \n");
printk(KERN_WARNING PREFIX "leave burst_mode:error\n");
return_VALUE(-1);
}
#endif /* ACPI_FUTURE_USAGE */
Expand Down Expand Up @@ -437,20 +437,20 @@ static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data)

status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
if (status) {
printk("read EC, IB not empty\n");
printk(KERN_DEBUG PREFIX "read EC, IB not empty\n");
goto end;
}
acpi_hw_low_level_write(8, ACPI_EC_COMMAND_READ,
&ec->common.command_addr);
status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
if (status) {
printk("read EC, IB not empty\n");
printk(KERN_DEBUG PREFIX "read EC, IB not empty\n");
}

acpi_hw_low_level_write(8, address, &ec->common.data_addr);
status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);
if (status) {
printk("read EC, OB not full\n");
printk(KERN_DEBUG PREFIX "read EC, OB not full\n");
goto end;
}
acpi_hw_low_level_read(8, data, &ec->common.data_addr);
Expand Down Expand Up @@ -487,19 +487,19 @@ static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data)

status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
if (status) {
printk("write EC, IB not empty\n");
printk(KERN_DEBUG PREFIX "write EC, IB not empty\n");
}
acpi_hw_low_level_write(8, ACPI_EC_COMMAND_WRITE,
&ec->common.command_addr);
status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
if (status) {
printk("write EC, IB not empty\n");
printk(KERN_DEBUG PREFIX "write EC, IB not empty\n");
}

acpi_hw_low_level_write(8, address, &ec->common.data_addr);
status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
if (status) {
printk("write EC, IB not empty\n");
printk(KERN_DEBUG PREFIX "write EC, IB not empty\n");
}

acpi_hw_low_level_write(8, data, &ec->common.data_addr);
Expand Down Expand Up @@ -630,7 +630,7 @@ static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data)

status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
if (status) {
printk("query EC, IB not empty\n");
printk(KERN_DEBUG PREFIX "query EC, IB not empty\n");
goto end;
}
/*
Expand All @@ -642,7 +642,7 @@ static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data)
&ec->common.command_addr);
status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);
if (status) {
printk("query EC, OB not full\n");
printk(KERN_DEBUG PREFIX "query EC, OB not full\n");
goto end;
}

Expand Down

0 comments on commit 0a174a6

Please sign in to comment.