PNP: remove pnp_resource.index
We used pnp_resource.index to keep track of which ISAPNP configuration register a resource should be written to. We needed this only to handle the case where a register is disabled but a subsequent register in the same set is enabled. Rather than explicitly maintaining the pnp_resource.index, this patch adds a resource every time we read an ISAPNP configuration register and marks the resource as IORESOURCE_DISABLED when appropriate. This makes the position in the pnp_resource_table always correspond to the config register index. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
This commit is contained in:
committed by
Andi Kleen
parent
b897f46cf7
commit
87e4acf3eb
@ -40,7 +40,6 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
|
||||
}
|
||||
|
||||
/* set the initial values */
|
||||
pnp_res->index = idx;
|
||||
res->flags |= rule->flags | IORESOURCE_IO;
|
||||
res->flags &= ~IORESOURCE_UNSET;
|
||||
|
||||
@ -90,7 +89,6 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
|
||||
}
|
||||
|
||||
/* set the initial values */
|
||||
pnp_res->index = idx;
|
||||
res->flags |= rule->flags | IORESOURCE_MEM;
|
||||
res->flags &= ~IORESOURCE_UNSET;
|
||||
|
||||
@ -155,7 +153,6 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
|
||||
}
|
||||
|
||||
/* set the initial values */
|
||||
pnp_res->index = idx;
|
||||
res->flags |= rule->flags | IORESOURCE_IRQ;
|
||||
res->flags &= ~IORESOURCE_UNSET;
|
||||
|
||||
@ -214,7 +211,6 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
|
||||
}
|
||||
|
||||
/* set the initial values */
|
||||
pnp_res->index = idx;
|
||||
res->flags |= rule->flags | IORESOURCE_DMA;
|
||||
res->flags &= ~IORESOURCE_UNSET;
|
||||
|
||||
|
Reference in New Issue
Block a user