aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/isapnp
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/isapnp
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/isapnp')
-rw-r--r--drivers/pnp/isapnp/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index ca4457ec403b..c5b92526963b 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -486,7 +486,7 @@ static void __init isapnp_parse_port_resource(struct pnp_dev *dev,
486 port->max = (tmp[4] << 8) | tmp[3]; 486 port->max = (tmp[4] << 8) | tmp[3];
487 port->align = tmp[5]; 487 port->align = tmp[5];
488 port->size = tmp[6]; 488 port->size = tmp[6];
489 port->flags = tmp[0] ? PNP_PORT_FLAG_16BITADDR : 0; 489 port->flags = tmp[0] ? IORESOURCE_IO_16BIT_ADDR : 0;
490 pnp_register_port_resource(dev, option, port); 490 pnp_register_port_resource(dev, option, port);
491} 491}
492 492
@@ -507,7 +507,7 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_dev *dev,
507 port->min = port->max = (tmp[1] << 8) | tmp[0]; 507 port->min = port->max = (tmp[1] << 8) | tmp[0];
508 port->size = tmp[2]; 508 port->size = tmp[2];
509 port->align = 0; 509 port->align = 0;
510 port->flags = PNP_PORT_FLAG_FIXED; 510 port->flags = IORESOURCE_IO_FIXED;
511 pnp_register_port_resource(dev, option, port); 511 pnp_register_port_resource(dev, option, port);
512} 512}
513 513