summaryrefslogtreecommitdiffstats
path: root/drivers/pnp/interface.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 16:34:25 -0600
committerLen Brown <len.brown@intel.com>2008-04-29 03:22:26 -0400
commitf6505fef18644557f732468c1f22f84560d8a819 (patch)
tree942bf646b502369e3f8e8f398265d0872e8d3a0c /drivers/pnp/interface.c
parent7e2cf31f1c97ac14b6d9dc5f1ce9e1e01aef9c18 (diff)
downloadlinux-f6505fef18644557f732468c1f22f84560d8a819.tar.bz2
PNP: convert assign, interface to use pnp_get_resource(), not pnp_resource_table
This removes more direct references to pnp_resource_table from the pnp_assign_resources() path and the /sys user interface path. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/interface.c')
-rw-r--r--drivers/pnp/interface.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 1801df3db1e8..a608054a3e53 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -383,7 +383,10 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
buf += 2;
while (isspace(*buf))
++buf;
- res = &dev->res.port_resource[nport];
+ res = pnp_get_resource(dev, IORESOURCE_IO,
+ nport);
+ if (!res)
+ break;
res->start = simple_strtoul(buf, &buf, 0);
while (isspace(*buf))
++buf;
@@ -396,15 +399,16 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
res->end = res->start;
res->flags = IORESOURCE_IO;
nport++;
- if (nport >= PNP_MAX_PORT)
- break;
continue;
}
if (!strnicmp(buf, "mem", 3)) {
buf += 3;
while (isspace(*buf))
++buf;
- res = &dev->res.mem_resource[nmem];
+ res = pnp_get_resource(dev, IORESOURCE_MEM,
+ nmem);
+ if (!res)
+ break;
res->start = simple_strtoul(buf, &buf, 0);
while (isspace(*buf))
++buf;
@@ -417,34 +421,34 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
res->end = res->start;
res->flags = IORESOURCE_MEM;
nmem++;
- if (nmem >= PNP_MAX_MEM)
- break;
continue;
}
if (!strnicmp(buf, "irq", 3)) {
buf += 3;
while (isspace(*buf))
++buf;
- res = &dev->res.irq_resource[nirq];
+ res = pnp_get_resource(dev, IORESOURCE_IRQ,
+ nirq);
+ if (!res)
+ break;
res->start = res->end =
simple_strtoul(buf, &buf, 0);
res->flags = IORESOURCE_IRQ;
nirq++;
- if (nirq >= PNP_MAX_IRQ)
- break;
continue;
}
if (!strnicmp(buf, "dma", 3)) {
buf += 3;
while (isspace(*buf))
++buf;
- res = &dev->res.dma_resource[ndma];
+ res = pnp_get_resource(dev, IORESOURCE_DMA,
+ ndma);
+ if (!res)
+ break;
res->start = res->end =
simple_strtoul(buf, &buf, 0);
res->flags = IORESOURCE_DMA;
ndma++;
- if (ndma >= PNP_MAX_DMA)
- break;
continue;
}
break;