diff options
-rw-r--r-- | drivers/acpi/motherboard.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c index 14ffe68a094e..d51d68f5dd8d 100644 --- a/drivers/acpi/motherboard.c +++ b/drivers/acpi/motherboard.c | |||
@@ -37,7 +37,7 @@ ACPI_MODULE_NAME("acpi_motherboard") | |||
37 | #define ACPI_MB_HID2 "PNP0C02" | 37 | #define ACPI_MB_HID2 "PNP0C02" |
38 | /** | 38 | /** |
39 | * Doesn't care about legacy IO ports, only IO ports beyond 0x1000 are reserved | 39 | * Doesn't care about legacy IO ports, only IO ports beyond 0x1000 are reserved |
40 | * Doesn't care about the failure of 'request_region', since other may reserve | 40 | * Doesn't care about the failure of 'request_region', since other may reserve |
41 | * the io ports as well | 41 | * the io ports as well |
42 | */ | 42 | */ |
43 | #define IS_RESERVED_ADDR(base, len) \ | 43 | #define IS_RESERVED_ADDR(base, len) \ |
@@ -46,7 +46,7 @@ ACPI_MODULE_NAME("acpi_motherboard") | |||
46 | /* | 46 | /* |
47 | * Clearing the flag (IORESOURCE_BUSY) allows drivers to use | 47 | * Clearing the flag (IORESOURCE_BUSY) allows drivers to use |
48 | * the io ports if they really know they can use it, while | 48 | * the io ports if they really know they can use it, while |
49 | * still preventing hotplug PCI devices from using it. | 49 | * still preventing hotplug PCI devices from using it. |
50 | */ | 50 | */ |
51 | static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data) | 51 | static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data) |
52 | { | 52 | { |
@@ -138,39 +138,39 @@ static void __init acpi_request_region (struct acpi_generic_address *addr, | |||
138 | static void __init acpi_reserve_resources(void) | 138 | static void __init acpi_reserve_resources(void) |
139 | { | 139 | { |
140 | acpi_request_region(&acpi_gbl_FADT->xpm1a_evt_blk, | 140 | acpi_request_region(&acpi_gbl_FADT->xpm1a_evt_blk, |
141 | acpi_gbl_FADT->pm1_evt_len, "PM1a_EVT_BLK"); | 141 | acpi_gbl_FADT->pm1_evt_len, "ACPI PM1a_EVT_BLK"); |
142 | 142 | ||
143 | acpi_request_region(&acpi_gbl_FADT->xpm1b_evt_blk, | 143 | acpi_request_region(&acpi_gbl_FADT->xpm1b_evt_blk, |
144 | acpi_gbl_FADT->pm1_evt_len, "PM1b_EVT_BLK"); | 144 | acpi_gbl_FADT->pm1_evt_len, "ACPI PM1b_EVT_BLK"); |
145 | 145 | ||
146 | acpi_request_region(&acpi_gbl_FADT->xpm1a_cnt_blk, | 146 | acpi_request_region(&acpi_gbl_FADT->xpm1a_cnt_blk, |
147 | acpi_gbl_FADT->pm1_cnt_len, "PM1a_CNT_BLK"); | 147 | acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1a_CNT_BLK"); |
148 | 148 | ||
149 | acpi_request_region(&acpi_gbl_FADT->xpm1b_cnt_blk, | 149 | acpi_request_region(&acpi_gbl_FADT->xpm1b_cnt_blk, |
150 | acpi_gbl_FADT->pm1_cnt_len, "PM1b_CNT_BLK"); | 150 | acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1b_CNT_BLK"); |
151 | 151 | ||
152 | if (acpi_gbl_FADT->pm_tm_len == 4) | 152 | if (acpi_gbl_FADT->pm_tm_len == 4) |
153 | acpi_request_region(&acpi_gbl_FADT->xpm_tmr_blk, 4, "PM_TMR"); | 153 | acpi_request_region(&acpi_gbl_FADT->xpm_tmr_blk, 4, "ACPI PM_TMR"); |
154 | 154 | ||
155 | acpi_request_region(&acpi_gbl_FADT->xpm2_cnt_blk, | 155 | acpi_request_region(&acpi_gbl_FADT->xpm2_cnt_blk, |
156 | acpi_gbl_FADT->pm2_cnt_len, "PM2_CNT_BLK"); | 156 | acpi_gbl_FADT->pm2_cnt_len, "ACPI PM2_CNT_BLK"); |
157 | 157 | ||
158 | /* Length of GPE blocks must be a non-negative multiple of 2 */ | 158 | /* Length of GPE blocks must be a non-negative multiple of 2 */ |
159 | 159 | ||
160 | if (!(acpi_gbl_FADT->gpe0_blk_len & 0x1)) | 160 | if (!(acpi_gbl_FADT->gpe0_blk_len & 0x1)) |
161 | acpi_request_region(&acpi_gbl_FADT->xgpe0_blk, | 161 | acpi_request_region(&acpi_gbl_FADT->xgpe0_blk, |
162 | acpi_gbl_FADT->gpe0_blk_len, "GPE0_BLK"); | 162 | acpi_gbl_FADT->gpe0_blk_len, "ACPI GPE0_BLK"); |
163 | 163 | ||
164 | if (!(acpi_gbl_FADT->gpe1_blk_len & 0x1)) | 164 | if (!(acpi_gbl_FADT->gpe1_blk_len & 0x1)) |
165 | acpi_request_region(&acpi_gbl_FADT->xgpe1_blk, | 165 | acpi_request_region(&acpi_gbl_FADT->xgpe1_blk, |
166 | acpi_gbl_FADT->gpe1_blk_len, "GPE1_BLK"); | 166 | acpi_gbl_FADT->gpe1_blk_len, "ACPI GPE1_BLK"); |
167 | } | 167 | } |
168 | 168 | ||
169 | static int __init acpi_motherboard_init(void) | 169 | static int __init acpi_motherboard_init(void) |
170 | { | 170 | { |
171 | acpi_bus_register_driver(&acpi_motherboard_driver1); | 171 | acpi_bus_register_driver(&acpi_motherboard_driver1); |
172 | acpi_bus_register_driver(&acpi_motherboard_driver2); | 172 | acpi_bus_register_driver(&acpi_motherboard_driver2); |
173 | /* | 173 | /* |
174 | * Guarantee motherboard IO reservation first | 174 | * Guarantee motherboard IO reservation first |
175 | * This module must run after scan.c | 175 | * This module must run after scan.c |
176 | */ | 176 | */ |