lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI EC: Re-factor EC space handler to avoid using label/goto for cycle.

Browse Source 
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Alexey Starikovskiy
2007-05-29 16:42:52 +04:00
committed by Len Brown
parent a4146557cd
commit 5b7734b440
1 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/acpi/ec.c
View File

@@ -454,57 +454,35 @@ acpi_ec_space_setup(acpi_handle region_handle,
} }
static acpi_status static acpi_status
acpi_ec_space_handler(u32 function, acpi_ec_space_handler(u32 function, acpi_physical_address address,
acpi_physical_address address, u32 bits, acpi_integer *value,
u32 bit_width,
acpi_integer * value,
void *handler_context, void *region_context) void *handler_context, void *region_context)
{ {
int result = 0;
struct acpi_ec *ec = handler_context; struct acpi_ec *ec = handler_context;
u64 temp = *value; int result = 0, i = 0;
acpi_integer f_v = 0; u8 temp = 0;
int i = 0;
if ((address > 0xFF) || !value || !handler_context) if ((address > 0xFF) || !value || !handler_context)
return AE_BAD_PARAMETER; return AE_BAD_PARAMETER;
if (bit_width != 8 && acpi_strict) { if (function != ACPI_READ && function != ACPI_WRITE)
return AE_BAD_PARAMETER; return AE_BAD_PARAMETER;
}
next_byte: if (bits != 8 && acpi_strict)
switch (function) { return AE_BAD_PARAMETER;
case ACPI_READ:
temp = 0;
result = acpi_ec_read(ec, (u8) address, (u8 *) & temp);
break;
case ACPI_WRITE:
result = acpi_ec_write(ec, (u8) address, (u8) temp);
break;
default:
result = -EINVAL;
goto out;
break;
}
bit_width -= 8;
if (bit_width) {
if (function == ACPI_READ)
f_v |= temp << 8 * i;
if (function == ACPI_WRITE)
temp >>= 8;
i++;
address++;
goto next_byte;
}
while (bits - i > 0) {
if (function == ACPI_READ) { if (function == ACPI_READ) {
f_v |= temp << 8 * i; result = acpi_ec_read(ec, address, &temp);
*value = f_v; (*value) |= ((acpi_integer)temp) << i;
} else {
temp = 0xff & ((*value) >> i);
result = acpi_ec_write(ec, address, temp);
}
i += 8;
++address;
} }
out:
switch (result) { switch (result) {
case -EINVAL: case -EINVAL:
return AE_BAD_PARAMETER; return AE_BAD_PARAMETER;