Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 44943
b: refs/heads/master
c: 78d0af3
h: refs/heads/master
i:
  44941: 4c7dea6
  44939: 8290a1e
  44935: f400e00
  44927: e160831
v: v3
  • Loading branch information
Alexey Starikovskiy authored and Len Brown committed Dec 8, 2006
1 parent b71061e commit 80d6da0
Show file tree
Hide file tree
Showing 2 changed files with 7 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: 523953b41e52952347d7d50dcc4bfc27bc001dc8
refs/heads/master: 78d0af3392cba6dfdd1dc1eab5a86ba8e4af8fff
16 changes: 6 additions & 10 deletions trunk/drivers/acpi/ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,20 +135,16 @@ static inline void acpi_ec_write_data(struct acpi_ec *ec, u8 data)
outb(data, ec->data_addr);
}

static int acpi_ec_check_status(struct acpi_ec *ec, u8 event)
static inline int acpi_ec_check_status(struct acpi_ec *ec, u8 event)
{
u8 status = acpi_ec_read_status(ec);
switch (event) {
case ACPI_EC_EVENT_OBF_1:

if (event == ACPI_EC_EVENT_OBF_1) {
if (status & ACPI_EC_FLAG_OBF)
return 1;
break;
case ACPI_EC_EVENT_IBF_0:
} else if (event == ACPI_EC_EVENT_IBF_0) {
if (!(status & ACPI_EC_FLAG_IBF))
return 1;
break;
default:
break;
}

return 0;
Expand Down Expand Up @@ -238,7 +234,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,

acpi_ec_write_cmd(ec, command);

for (; wdata_len > 0; wdata_len --) {
for (; wdata_len > 0; --wdata_len) {
result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
if (result) {
printk(KERN_ERR PREFIX "write_cmd timeout, command = %d\n",
Expand All @@ -259,7 +255,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
atomic_set(&ec->query_pending, 0);
}

for (; rdata_len > 0; rdata_len --) {
for (; rdata_len > 0; --rdata_len) {
result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1);
if (result) {
printk(KERN_ERR PREFIX "read timeout, command = %d\n",
Expand Down

0 comments on commit 80d6da0

Please sign in to comment.