This removes more direct references to pnp_resource_table.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
---
drivers/pnp/resource.c | 96 +++++++++++++++++++++++++++++--------------------
1 file changed, 58 insertions(+), 38 deletions(-)
Index: work8/drivers/pnp/resource.c
===================================================================
--- work8.orig/drivers/pnp/resource.c 2008-04-10 13:59:17.000000000 -0600
+++ work8/drivers/pnp/resource.c 2008-04-10 15:23:34.000000000 -0600
@@ -216,16 +216,19 @@
int pnp_check_port(struct pnp_dev *dev, int idx)
{
int i;
+ struct resource *res, *tres;
struct pnp_dev *tdev;
resource_size_t *port, *end, *tport, *tend;
- port = &dev->res.port_resource[idx].start;
- end = &dev->res.port_resource[idx].end;
+ res = pnp_get_resource(dev, IORESOURCE_IO, idx);
/* if the resource doesn't exist, don't complain about it */
- if (cannot_compare(dev->res.port_resource[idx].flags))
+ if (!res || cannot_compare(res->flags))
return 1;
+ port = &res->start;
+ end = &res->end;
+
/* check if the resource is already in use, skip if the
* device is active because it itself may be in use */
if (!dev->active) {
@@ -243,9 +246,10 @@
/* check for internal conflicts */
for (i = 0; i < PNP_MAX_PORT && i != idx; i++) {
- if (dev->res.port_resource[i].flags & IORESOURCE_IO) {
- tport = &dev->res.port_resource[i].start;
- tend = &dev->res.port_resource[i].end;
+ tres = pnp_get_resource(dev, IORESOURCE_IO, i);
+ if (tres && tres->flags & IORESOURCE_IO) {
+ tport = &tres->start;
+ tend = &tres->end;
if (ranged_conflict(port, end, tport, tend))
return 0;
}
@@ -256,12 +260,12 @@
if (tdev == dev)
continue;
for (i = 0; i < PNP_MAX_PORT; i++) {
- if (tdev->res.port_resource[i].flags & IORESOURCE_IO) {
- if (cannot_compare
- (tdev->res.port_resource[i].flags))
+ tres = pnp_get_resource(tdev, IORESOURCE_IO, i);
+ if (tres && tres->flags & IORESOURCE_IO) {
+ if (cannot_compare(tres->flags))
continue;
- tport = &tdev->res.port_resource[i].start;
- tend = &tdev->res.port_resource[i].end;
+ tport = &tres->start;
+ tend = &tres->end;
if (ranged_conflict(port, end, tport, tend))
return 0;
}
@@ -274,16 +278,19 @@
int pnp_check_mem(struct pnp_dev *dev, int idx)
{
int i;
+ struct resource *res, *tres;
struct pnp_dev *tdev;
resource_size_t *addr, *end, *taddr, *tend;
- addr = &dev->res.mem_resource[idx].start;
- end = &dev->res.mem_resource[idx].end;
+ res = pnp_get_resource(dev, IORESOURCE_MEM, idx);
/* if the resource doesn't exist, don't complain about it */
- if (cannot_compare(dev->res.mem_resource[idx].flags))
+ if (!res || cannot_compare(res->flags))
return 1;
+ addr = &res->start;
+ end = &res->end;
+
/* check if the resource is already in use, skip if the
* device is active because it itself may be in use */
if (!dev->active) {
@@ -301,9 +308,10 @@
/* check for internal conflicts */
for (i = 0; i < PNP_MAX_MEM && i != idx; i++) {
- if (dev->res.mem_resource[i].flags & IORESOURCE_MEM) {
- taddr = &dev->res.mem_resource[i].start;
- tend = &dev->res.mem_resource[i].end;
+ tres = pnp_get_resource(dev, IORESOURCE_MEM, i);
+ if (tres && tres->flags & IORESOURCE_MEM) {
+ taddr = &tres->start;
+ tend = &tres->end;
if (ranged_conflict(addr, end, taddr, tend))
return 0;
}
@@ -314,12 +322,12 @@
if (tdev == dev)
continue;
for (i = 0; i < PNP_MAX_MEM; i++) {
- if (tdev->res.mem_resource[i].flags & IORESOURCE_MEM) {
- if (cannot_compare
- (tdev->res.mem_resource[i].flags))
+ tres = pnp_get_resource(tdev, IORESOURCE_MEM, i);
+ if (tres && tres->flags & IORESOURCE_MEM) {
+ if (cannot_compare(tres->flags))
continue;
- taddr = &tdev->res.mem_resource[i].start;
- tend = &tdev->res.mem_resource[i].end;
+ taddr = &tres->start;
+ tend = &tres->end;
if (ranged_conflict(addr, end, taddr, tend))
return 0;
}
@@ -337,13 +345,18 @@
int pnp_check_irq(struct pnp_dev *dev, int idx)
{
int i;
+ struct resource *res, *tres;
struct pnp_dev *tdev;
- resource_size_t *irq = &dev->res.irq_resource[idx].start;
+ resource_size_t *irq;
+
+ res = pnp_get_resource(dev, IORESOURCE_IRQ, idx);
/* if the resource doesn't exist, don't complain about it */
- if (cannot_compare(dev->res.irq_resource[idx].flags))
+ if (!res || cannot_compare(res->flags))
return 1;
+ irq = &res->start;
+
/* check if the resource is valid */
if (*irq < 0 || *irq > 15)
return 0;
@@ -356,8 +369,9 @@
/* check for internal conflicts */
for (i = 0; i < PNP_MAX_IRQ && i != idx; i++) {
- if (dev->res.irq_resource[i].flags & IORESOURCE_IRQ) {
- if (dev->res.irq_resource[i].start == *irq)
+ tres = pnp_get_resource(dev, IORESOURCE_IRQ, i);
+ if (tres && tres->flags & IORESOURCE_IRQ) {
+ if (tres->start == *irq)
return 0;
}
}
@@ -389,11 +403,11 @@
if (tdev == dev)
continue;
for (i = 0; i < PNP_MAX_IRQ; i++) {
- if (tdev->res.irq_resource[i].flags & IORESOURCE_IRQ) {
- if (cannot_compare
- (tdev->res.irq_resource[i].flags))
+ tres = pnp_get_resource(tdev, IORESOURCE_IRQ, i);
+ if (tres && tres->flags & IORESOURCE_IRQ) {
+ if (cannot_compare(tres->flags))
continue;
- if ((tdev->res.irq_resource[i].start == *irq))
+ if (tres->start == *irq)
return 0;
}
}
@@ -406,13 +420,18 @@
{
#ifndef CONFIG_IA64
int i;
+ struct resource *res, *tres;
struct pnp_dev *tdev;
- resource_size_t *dma = &dev->res.dma_resource[idx].start;
+ resource_size_t *dma;
+
+ res = pnp_get_resource(dev, IORESOURCE_DMA, idx);
/* if the resource doesn't exist, don't complain about it */
- if (cannot_compare(dev->res.dma_resource[idx].flags))
+ if (!res || cannot_compare(res->flags))
return 1;
+ dma = &res->start;
+
/* check if the resource is valid */
if (*dma < 0 || *dma == 4 || *dma > 7)
return 0;
@@ -425,8 +444,9 @@
/* check for internal conflicts */
for (i = 0; i < PNP_MAX_DMA && i != idx; i++) {
- if (dev->res.dma_resource[i].flags & IORESOURCE_DMA) {
- if (dev->res.dma_resource[i].start == *dma)
+ tres = pnp_get_resource(dev, IORESOURCE_DMA, i);
+ if (tres && tres->flags & IORESOURCE_DMA) {
+ if (tres->start == *dma)
return 0;
}
}
@@ -444,11 +464,11 @@
if (tdev == dev)
continue;
for (i = 0; i < PNP_MAX_DMA; i++) {
- if (tdev->res.dma_resource[i].flags & IORESOURCE_DMA) {
- if (cannot_compare
- (tdev->res.dma_resource[i].flags))
+ tres = pnp_get_resource(tdev, IORESOURCE_DMA, i);
+ if (tres && tres->flags & IORESOURCE_DMA) {
+ if (cannot_compare(tres->flags))
continue;
- if ((tdev->res.dma_resource[i].start == *dma))
+ if (tres->start == *dma)
return 0;
}
}
--
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
