Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 19494
b: refs/heads/master
c: 3d5271f
h: refs/heads/master
v: v3
  • Loading branch information
Len Brown committed Dec 6, 2005
1 parent 78fc04b commit 7bbbbd3
Show file tree
Hide file tree
Showing 28 changed files with 1,741 additions and 1,848 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9115a6c787596e687df03010d97fccc5e0762506
refs/heads/master: 3d5271f9883cba7b54762bc4fe027d4172f06db7
2 changes: 1 addition & 1 deletion trunk/arch/ia64/kernel/acpi-ext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ acpi_vendor_resource_match(struct acpi_resource *resource, void *context)
struct acpi_vendor_descriptor *descriptor;
u32 length;

if (resource->id != ACPI_RSTYPE_VENDOR)
if (resource->type != ACPI_RSTYPE_VENDOR)
return AE_OK;

vendor = (struct acpi_resource_vendor *)&resource->data;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/ec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ acpi_ec_io_ports(struct acpi_resource *resource, void *context)
union acpi_ec *ec = (union acpi_ec *)context;
struct acpi_generic_address *addr;

if (resource->id != ACPI_RSTYPE_IO) {
if (resource->type != ACPI_RSTYPE_IO) {
return AE_OK;
}

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/acpi/glue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
unsigned long *busnr = (unsigned long *)data;
struct acpi_resource_address64 address;

if (resource->id != ACPI_RSTYPE_ADDRESS16 &&
resource->id != ACPI_RSTYPE_ADDRESS32 &&
resource->id != ACPI_RSTYPE_ADDRESS64)
if (resource->type != ACPI_RSTYPE_ADDRESS16 &&
resource->type != ACPI_RSTYPE_ADDRESS32 &&
resource->type != ACPI_RSTYPE_ADDRESS64)
return AE_OK;

acpi_resource_to_address64(resource, &address);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/acpi/motherboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)

ACPI_FUNCTION_TRACE("acpi_reserve_io_ranges");

if (res->id == ACPI_RSTYPE_IO) {
if (res->type == ACPI_RSTYPE_IO) {
struct acpi_resource_io *io_res = &res->data.io;

if (io_res->min_base_address != io_res->max_base_address)
Expand All @@ -70,7 +70,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
request_region(io_res->min_base_address,
io_res->range_length, "motherboard");
}
} else if (res->id == ACPI_RSTYPE_FIXED_IO) {
} else if (res->type == ACPI_RSTYPE_FIXED_IO) {
struct acpi_resource_fixed_io *fixed_io_res =
&res->data.fixed_io;

Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/acpi/pci_link.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)

ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible");

switch (resource->id) {
switch (resource->type) {
case ACPI_RSTYPE_START_DPF:
return_ACPI_STATUS(AE_OK);
case ACPI_RSTYPE_IRQ:
Expand Down Expand Up @@ -201,7 +201,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)

ACPI_FUNCTION_TRACE("acpi_pci_link_check_current");

switch (resource->id) {
switch (resource->type) {
case ACPI_RSTYPE_IRQ:
{
struct acpi_resource_irq *p = &resource->data.irq;
Expand Down Expand Up @@ -326,7 +326,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)

switch (link->irq.resource_type) {
case ACPI_RSTYPE_IRQ:
resource->res.id = ACPI_RSTYPE_IRQ;
resource->res.type = ACPI_RSTYPE_IRQ;
resource->res.length = sizeof(struct acpi_resource);
resource->res.data.irq.edge_level = link->irq.edge_level;
resource->res.data.irq.active_high_low =
Expand All @@ -341,7 +341,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
break;

case ACPI_RSTYPE_EXT_IRQ:
resource->res.id = ACPI_RSTYPE_EXT_IRQ;
resource->res.type = ACPI_RSTYPE_EXT_IRQ;
resource->res.length = sizeof(struct acpi_resource);
resource->res.data.extended_irq.producer_consumer =
ACPI_CONSUMER;
Expand All @@ -364,7 +364,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
goto end;

}
resource->end.id = ACPI_RSTYPE_END_TAG;
resource->end.type = ACPI_RSTYPE_END_TAG;

/* Attempt to set the resource */
status = acpi_set_current_resources(link->handle, &buffer);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/acpi/pci_root.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
int *busnr = (int *)data;
struct acpi_resource_address64 address;

if (resource->id != ACPI_RSTYPE_ADDRESS16 &&
resource->id != ACPI_RSTYPE_ADDRESS32 &&
resource->id != ACPI_RSTYPE_ADDRESS64)
if (resource->type != ACPI_RSTYPE_ADDRESS16 &&
resource->type != ACPI_RSTYPE_ADDRESS32 &&
resource->type != ACPI_RSTYPE_ADDRESS64)
return AE_OK;

acpi_resource_to_address64(resource, &address);
Expand Down
Loading

0 comments on commit 7bbbbd3

Please sign in to comment.