diff options
Diffstat (limited to 'drivers/acpi/pci_link.c')
-rw-r--r-- | drivers/acpi/pci_link.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 82292b77e5c6..d8956c0bf143 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -108,7 +108,7 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context) | |||
108 | 108 | ||
109 | ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible"); | 109 | ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible"); |
110 | 110 | ||
111 | switch (resource->id) { | 111 | switch (resource->type) { |
112 | case ACPI_RSTYPE_START_DPF: | 112 | case ACPI_RSTYPE_START_DPF: |
113 | return_ACPI_STATUS(AE_OK); | 113 | return_ACPI_STATUS(AE_OK); |
114 | case ACPI_RSTYPE_IRQ: | 114 | case ACPI_RSTYPE_IRQ: |
@@ -201,7 +201,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context) | |||
201 | 201 | ||
202 | ACPI_FUNCTION_TRACE("acpi_pci_link_check_current"); | 202 | ACPI_FUNCTION_TRACE("acpi_pci_link_check_current"); |
203 | 203 | ||
204 | switch (resource->id) { | 204 | switch (resource->type) { |
205 | case ACPI_RSTYPE_IRQ: | 205 | case ACPI_RSTYPE_IRQ: |
206 | { | 206 | { |
207 | struct acpi_resource_irq *p = &resource->data.irq; | 207 | struct acpi_resource_irq *p = &resource->data.irq; |
@@ -326,7 +326,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
326 | 326 | ||
327 | switch (link->irq.resource_type) { | 327 | switch (link->irq.resource_type) { |
328 | case ACPI_RSTYPE_IRQ: | 328 | case ACPI_RSTYPE_IRQ: |
329 | resource->res.id = ACPI_RSTYPE_IRQ; | 329 | resource->res.type = ACPI_RSTYPE_IRQ; |
330 | resource->res.length = sizeof(struct acpi_resource); | 330 | resource->res.length = sizeof(struct acpi_resource); |
331 | resource->res.data.irq.edge_level = link->irq.edge_level; | 331 | resource->res.data.irq.edge_level = link->irq.edge_level; |
332 | resource->res.data.irq.active_high_low = | 332 | resource->res.data.irq.active_high_low = |
@@ -341,7 +341,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
341 | break; | 341 | break; |
342 | 342 | ||
343 | case ACPI_RSTYPE_EXT_IRQ: | 343 | case ACPI_RSTYPE_EXT_IRQ: |
344 | resource->res.id = ACPI_RSTYPE_EXT_IRQ; | 344 | resource->res.type = ACPI_RSTYPE_EXT_IRQ; |
345 | resource->res.length = sizeof(struct acpi_resource); | 345 | resource->res.length = sizeof(struct acpi_resource); |
346 | resource->res.data.extended_irq.producer_consumer = | 346 | resource->res.data.extended_irq.producer_consumer = |
347 | ACPI_CONSUMER; | 347 | ACPI_CONSUMER; |
@@ -364,7 +364,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
364 | goto end; | 364 | goto end; |
365 | 365 | ||
366 | } | 366 | } |
367 | resource->end.id = ACPI_RSTYPE_END_TAG; | 367 | resource->end.type = ACPI_RSTYPE_END_TAG; |
368 | 368 | ||
369 | /* Attempt to set the resource */ | 369 | /* Attempt to set the resource */ |
370 | status = acpi_set_current_resources(link->handle, &buffer); | 370 | status = acpi_set_current_resources(link->handle, &buffer); |