PNP: convert encoders to use pnp_get_resource(), not pnp_resource_table

[pandora-kernel.git] / drivers / pnp / pnpacpi / rsparser.c

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index bd41e4d..000a1b3 100644 (file)
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -1014,7 +1014,6 @@ static void pnpacpi_encode_fixed_mem32(struct pnp_dev *dev,
 
 int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer)
 {
-       struct pnp_resource_table *res_table = &dev->res;
        int i = 0;
        /* pnpacpi_build_resource_template allocates extra mem */
        int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1;
@@ -1026,45 +1025,43 @@ int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer)
                switch (resource->type) {
                case ACPI_RESOURCE_TYPE_IRQ:
                        pnpacpi_encode_irq(dev, resource,
-                                          &res_table->irq_resource[irq]);
+                              pnp_get_resource(dev, IORESOURCE_IRQ, irq));
                        irq++;
                        break;
 
                case ACPI_RESOURCE_TYPE_DMA:
                        pnpacpi_encode_dma(dev, resource,
-                                          &res_table->dma_resource[dma]);
+                               pnp_get_resource(dev, IORESOURCE_DMA, dma));
                        dma++;
                        break;
                case ACPI_RESOURCE_TYPE_IO:
                        pnpacpi_encode_io(dev, resource,
-                                         &res_table->port_resource[port]);
+                               pnp_get_resource(dev, IORESOURCE_IO, port));
                        port++;
                        break;
                case ACPI_RESOURCE_TYPE_FIXED_IO:
                        pnpacpi_encode_fixed_io(dev, resource,
-                                               &res_table->
-                                               port_resource[port]);
+                               pnp_get_resource(dev, IORESOURCE_IO, port));
                        port++;
                        break;
                case ACPI_RESOURCE_TYPE_MEMORY24:
                        pnpacpi_encode_mem24(dev, resource,
-                                            &res_table->mem_resource[mem]);
+                               pnp_get_resource(dev, IORESOURCE_MEM, mem));
                        mem++;
                        break;
                case ACPI_RESOURCE_TYPE_MEMORY32:
                        pnpacpi_encode_mem32(dev, resource,
-                                            &res_table->mem_resource[mem]);
+                               pnp_get_resource(dev, IORESOURCE_MEM, mem));
                        mem++;
                        break;
                case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
                        pnpacpi_encode_fixed_mem32(dev, resource,
-                                                  &res_table->
-                                                  mem_resource[mem]);
+                               pnp_get_resource(dev, IORESOURCE_MEM, mem));
                        mem++;
                        break;
                case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                        pnpacpi_encode_ext_irq(dev, resource,
-                                              &res_table->irq_resource[irq]);
+                               pnp_get_resource(dev, IORESOURCE_IRQ, irq));
                        irq++;
                        break;
                case ACPI_RESOURCE_TYPE_START_DEPENDENT: