Skip to content

L
linux-davinci-2.6.23
Commit 50c1e113 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files
Options

ACPI: ec: Drop udelay() from poll mode. Loop by reading status field instead. 

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a86e2772
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
drivers/acpi/ec.c
View file @ 50c1e113
...@@ -70,8 +70,6 @@ enum { ...@@ -70,8 +70,6 @@ enum {
#define ACPI_EC_DELAY 500 /* Wait 500ms max. during EC ops */ #define ACPI_EC_DELAY 500 /* Wait 500ms max. during EC ops */
#define ACPI_EC_UDELAY_GLK 1000 /* Wait 1ms max. to get global lock */ #define ACPI_EC_UDELAY_GLK 1000 /* Wait 1ms max. to get global lock */
#define ACPI_EC_UDELAY 100 /* Poll @ 100us increments */
#define ACPI_EC_UDELAY_COUNT 1000 /* Wait 100ms max. during EC ops */
enum { enum {
EC_INTR = 1, /* Output buffer full */ EC_INTR = 1, /* Output buffer full */
...@@ -159,11 +157,10 @@ static int acpi_ec_check_status(struct acpi_ec *ec, u8 event) ...@@ -159,11 +157,10 @@ static int acpi_ec_check_status(struct acpi_ec *ec, u8 event)
static int acpi_ec_wait(struct acpi_ec *ec, u8 event) static int acpi_ec_wait(struct acpi_ec *ec, u8 event)
{ {
if (acpi_ec_mode == EC_POLL) { if (acpi_ec_mode == EC_POLL) {
int i; unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
for (i = 0; i < ACPI_EC_UDELAY_COUNT; ++i) { while (time_before(jiffies, delay)) {
if (acpi_ec_check_status(ec, event)) if (acpi_ec_check_status(ec, event))
return 0; return 0;
udelay(ACPI_EC_UDELAY);
} }
} else { } else {
if (wait_event_timeout(ec->wait, if (wait_event_timeout(ec->wait,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment