aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-06-27 18:57:03 -0400
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 17:27:06 -0400
commit08c9f262f268f7948be13bf3a5bda1d635c649b4 (patch)
treedf3a05a859071e5dd407eca3b4b218be1425d7a3 /drivers/pnp/pnpacpi
parentb72ee1f11e373179ec703e0e5afaf585ed3a950a (diff)
PNP: define PNP-specific IORESOURCE_IO_* flags alongside IRQ, DMA, MEM
PNP previously defined PNP_PORT_FLAG_16BITADDR and PNP_PORT_FLAG_FIXED in a private header file, but put those flags in struct resource.flags fields. Better to make them IORESOURCE_IO_* flags like the existing IRQ, DMA, and MEM flags. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Acked-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/pnpacpi')
-rw-r--r--drivers/pnp/pnpacpi/rsparser.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 595252b65205..46069e64a6b2 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -180,7 +180,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev, u64 start,
180 u64 end = start + len - 1; 180 u64 end = start + len - 1;
181 181
182 if (io_decode == ACPI_DECODE_16) 182 if (io_decode == ACPI_DECODE_16)
183 flags |= PNP_PORT_FLAG_16BITADDR; 183 flags |= IORESOURCE_IO_16BIT_ADDR;
184 if (len == 0 || end >= 0x10003) 184 if (len == 0 || end >= 0x10003)
185 flags |= IORESOURCE_DISABLED; 185 flags |= IORESOURCE_DISABLED;
186 186
@@ -485,7 +485,7 @@ static __init void pnpacpi_parse_port_option(struct pnp_dev *dev,
485 port->align = io->alignment; 485 port->align = io->alignment;
486 port->size = io->address_length; 486 port->size = io->address_length;
487 port->flags = ACPI_DECODE_16 == io->io_decode ? 487 port->flags = ACPI_DECODE_16 == io->io_decode ?
488 PNP_PORT_FLAG_16BITADDR : 0; 488 IORESOURCE_IO_16BIT_ADDR : 0;
489 pnp_register_port_resource(dev, option, port); 489 pnp_register_port_resource(dev, option, port);
490} 490}
491 491
@@ -503,7 +503,7 @@ static __init void pnpacpi_parse_fixed_port_option(struct pnp_dev *dev,
503 port->min = port->max = io->address; 503 port->min = port->max = io->address;
504 port->size = io->address_length; 504 port->size = io->address_length;
505 port->align = 0; 505 port->align = 0;
506 port->flags = PNP_PORT_FLAG_FIXED; 506 port->flags = IORESOURCE_IO_FIXED;
507 pnp_register_port_resource(dev, option, port); 507 pnp_register_port_resource(dev, option, port);
508} 508}
509 509
@@ -609,7 +609,7 @@ static __init void pnpacpi_parse_address_option(struct pnp_dev *dev,
609 port->min = port->max = p->minimum; 609 port->min = port->max = p->minimum;
610 port->size = p->address_length; 610 port->size = p->address_length;
611 port->align = 0; 611 port->align = 0;
612 port->flags = PNP_PORT_FLAG_FIXED; 612 port->flags = IORESOURCE_IO_FIXED;
613 pnp_register_port_resource(dev, option, port); 613 pnp_register_port_resource(dev, option, port);
614 } 614 }
615} 615}
@@ -946,7 +946,7 @@ static void pnpacpi_encode_io(struct pnp_dev *dev,
946 946
947 if (pnp_resource_enabled(p)) { 947 if (pnp_resource_enabled(p)) {
948 /* Note: pnp_assign_port copies pnp_port->flags into p->flags */ 948 /* Note: pnp_assign_port copies pnp_port->flags into p->flags */
949 io->io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR) ? 949 io->io_decode = (p->flags & IORESOURCE_IO_16BIT_ADDR) ?
950 ACPI_DECODE_16 : ACPI_DECODE_10; 950 ACPI_DECODE_16 : ACPI_DECODE_10;
951 io->minimum = p->start; 951 io->minimum = p->start;
952 io->maximum = p->end; 952 io->maximum = p->end;