diff options
Diffstat (limited to 'drivers/acpi/motherboard.c')
-rw-r--r-- | drivers/acpi/motherboard.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c index e928e8c2c6ec..468244147ec1 100644 --- a/drivers/acpi/motherboard.c +++ b/drivers/acpi/motherboard.c | |||
@@ -54,36 +54,36 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data) | |||
54 | 54 | ||
55 | ACPI_FUNCTION_TRACE("acpi_reserve_io_ranges"); | 55 | ACPI_FUNCTION_TRACE("acpi_reserve_io_ranges"); |
56 | 56 | ||
57 | if (res->id == ACPI_RSTYPE_IO) { | 57 | if (res->type == ACPI_RESOURCE_TYPE_IO) { |
58 | struct acpi_resource_io *io_res = &res->data.io; | 58 | struct acpi_resource_io *io_res = &res->data.io; |
59 | 59 | ||
60 | if (io_res->min_base_address != io_res->max_base_address) | 60 | if (io_res->minimum != io_res->maximum) |
61 | return_VALUE(AE_OK); | 61 | return_VALUE(AE_OK); |
62 | if (IS_RESERVED_ADDR | 62 | if (IS_RESERVED_ADDR |
63 | (io_res->min_base_address, io_res->range_length)) { | 63 | (io_res->minimum, io_res->address_length)) { |
64 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 64 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
65 | "Motherboard resources 0x%08x - 0x%08x\n", | 65 | "Motherboard resources 0x%08x - 0x%08x\n", |
66 | io_res->min_base_address, | 66 | io_res->minimum, |
67 | io_res->min_base_address + | 67 | io_res->minimum + |
68 | io_res->range_length)); | 68 | io_res->address_length)); |
69 | requested_res = | 69 | requested_res = |
70 | request_region(io_res->min_base_address, | 70 | request_region(io_res->minimum, |
71 | io_res->range_length, "motherboard"); | 71 | io_res->address_length, "motherboard"); |
72 | } | 72 | } |
73 | } else if (res->id == ACPI_RSTYPE_FIXED_IO) { | 73 | } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_IO) { |
74 | struct acpi_resource_fixed_io *fixed_io_res = | 74 | struct acpi_resource_fixed_io *fixed_io_res = |
75 | &res->data.fixed_io; | 75 | &res->data.fixed_io; |
76 | 76 | ||
77 | if (IS_RESERVED_ADDR | 77 | if (IS_RESERVED_ADDR |
78 | (fixed_io_res->base_address, fixed_io_res->range_length)) { | 78 | (fixed_io_res->address, fixed_io_res->address_length)) { |
79 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 79 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
80 | "Motherboard resources 0x%08x - 0x%08x\n", | 80 | "Motherboard resources 0x%08x - 0x%08x\n", |
81 | fixed_io_res->base_address, | 81 | fixed_io_res->address, |
82 | fixed_io_res->base_address + | 82 | fixed_io_res->address + |
83 | fixed_io_res->range_length)); | 83 | fixed_io_res->address_length)); |
84 | requested_res = | 84 | requested_res = |
85 | request_region(fixed_io_res->base_address, | 85 | request_region(fixed_io_res->address, |
86 | fixed_io_res->range_length, | 86 | fixed_io_res->address_length, |
87 | "motherboard"); | 87 | "motherboard"); |
88 | } | 88 | } |
89 | } else { | 89 | } else { |