Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eca008c8 authored by Len Brown's avatar Len Brown
Browse files

[ACPI] handle ACPICA 20050916's acpi_resource.type rename 



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent bda663d3

drivers/acpi/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/acpi/glue.c

+3 −3
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ do_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);

drivers/acpi/motherboard.c

+2 −2
Original line number Diff line number Diff line
@@ -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)
@@ -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;

drivers/acpi/pci_link.c

+5 −5
Original line number Diff line number Diff line
@@ -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:
@@ -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;
@@ -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 =
@@ -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;
@@ -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);

drivers/acpi/pci_root.c

+3 −3
Original line number Diff line number Diff line
@@ -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);