[patch 29/53] PNP: convert sysfs interface to use pnp_get_resource(), not pnp_resource_table

From: Bjorn Helgaas
Date: Fri Apr 18 2008 - 17:04:01 EST


This removes more direct references to pnp_resource_table.

Note that this does not allow adding new resources beyond the
preallocated ones, so even though it does not reference
pnp_resource_table directly, it is still limited to the
fixed size of that table. When the preallocation is removed,
we'll have to change this so it can add new resources.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>

Index: work8/drivers/pnp/interface.c
===================================================================
--- work8.orig/drivers/pnp/interface.c 2008-04-10 16:09:39.000000000 -0600
+++ work8/drivers/pnp/interface.c 2008-04-10 16:15:48.000000000 -0600
@@ -323,6 +323,7 @@
const char *ubuf, size_t count)
{
struct pnp_dev *dev = to_pnp_dev(dmdev);
+ struct resource *res;
char *buf = (void *)ubuf;
int retval = 0;

@@ -382,76 +383,72 @@
buf += 2;
while (isspace(*buf))
++buf;
- dev->res.port_resource[nport].start =
- simple_strtoul(buf, &buf, 0);
+ res = pnp_get_resource(dev, IORESOURCE_IO,
+ nport);
+ if (!res)
+ break;
+ res->start = simple_strtoul(buf, &buf, 0);
while (isspace(*buf))
++buf;
if (*buf == '-') {
buf += 1;
while (isspace(*buf))
++buf;
- dev->res.port_resource[nport].end =
- simple_strtoul(buf, &buf, 0);
+ res->end = simple_strtoul(buf, &buf, 0);
} else
- dev->res.port_resource[nport].end =
- dev->res.port_resource[nport].start;
- dev->res.port_resource[nport].flags =
- IORESOURCE_IO;
+ 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;
- dev->res.mem_resource[nmem].start =
- simple_strtoul(buf, &buf, 0);
+ res = pnp_get_resource(dev, IORESOURCE_MEM,
+ nmem);
+ if (!res)
+ break;
+ res->start = simple_strtoul(buf, &buf, 0);
while (isspace(*buf))
++buf;
if (*buf == '-') {
buf += 1;
while (isspace(*buf))
++buf;
- dev->res.mem_resource[nmem].end =
- simple_strtoul(buf, &buf, 0);
+ res->end = simple_strtoul(buf, &buf, 0);
} else
- dev->res.mem_resource[nmem].end =
- dev->res.mem_resource[nmem].start;
- dev->res.mem_resource[nmem].flags =
- IORESOURCE_MEM;
+ 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;
- dev->res.irq_resource[nirq].start =
- dev->res.irq_resource[nirq].end =
+ res = pnp_get_resource(dev, IORESOURCE_IRQ,
+ nirq);
+ if (!res)
+ break;
+ res->start = res->end =
simple_strtoul(buf, &buf, 0);
- dev->res.irq_resource[nirq].flags =
- IORESOURCE_IRQ;
+ res->flags = IORESOURCE_IRQ;
nirq++;
- if (nirq >= PNP_MAX_IRQ)
- break;
continue;
}
if (!strnicmp(buf, "dma", 3)) {
buf += 3;
while (isspace(*buf))
++buf;
- dev->res.dma_resource[ndma].start =
- dev->res.dma_resource[ndma].end =
+ res = pnp_get_resource(dev, IORESOURCE_DMA,
+ ndma);
+ if (!res)
+ break;
+ res->start = res->end =
simple_strtoul(buf, &buf, 0);
- dev->res.dma_resource[ndma].flags =
- IORESOURCE_DMA;
+ res->flags = IORESOURCE_DMA;
ndma++;
- if (ndma >= PNP_MAX_DMA)
- break;
continue;
}
break;

--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/