Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PNP: dont sort by type in /sys/.../resources

Browse source 
Rather than stepping through all IO resources, then stepping through
all MMIO resources, etc., we can just iterate over the resource list
once directly.

This can change the order in /sys, e.g.,

    # cat /sys/devices/pnp0/00:07/resources     # OLD
    state = active
    io 0x3f8-0x3ff
    irq 4

    # cat /sys/devices/pnp0/00:07/resources     # NEW
    state = active
    irq 4
    io 0x3f8-0x3ff

The old code artificially sorted resources by type; the new code
just lists them in the order we read them from the ISAPNP hardware
or the BIOS.

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:
Bjorn Helgaas 2008-06-27 16:57:00 -06:00 committed by Andi Kleen
parent 25d39c39d8
commit f61ed7e32d
1 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
drivers/pnp/interface.c
View file

@ -248,8 +248,9 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
char *buf) char *buf)
{ {
struct pnp_dev *dev = to_pnp_dev(dmdev); struct pnp_dev *dev = to_pnp_dev(dmdev);
struct pnp_resource *pnp_res;
struct resource *res; struct resource *res;
int i, ret; int ret;
pnp_info_buffer_t *buffer; pnp_info_buffer_t *buffer;
if (!dev) if (!dev)
@ -262,46 +263,33 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
buffer->buffer = buf; buffer->buffer = buf;
buffer->curr = buffer->buffer; buffer->curr = buffer->buffer;
pnp_printf(buffer, "state = "); pnp_printf(buffer, "state = %s\n", dev->active ? "active" : "disabled");
if (dev->active)
pnp_printf(buffer, "active\n");
else
pnp_printf(buffer, "disabled\n");
for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) { list_for_each_entry(pnp_res, &dev->resources, list) {
pnp_printf(buffer, "io"); res = &pnp_res->res;
if (res->flags & IORESOURCE_DISABLED)
pnp_printf(buffer, pnp_resource_type_name(res));
if (res->flags & IORESOURCE_DISABLED) {
pnp_printf(buffer, " disabled\n"); pnp_printf(buffer, " disabled\n");
else continue;
pnp_printf(buffer, " 0x%llx-0x%llx\n", }
switch (pnp_resource_type(res)) {
case IORESOURCE_IO:
case IORESOURCE_MEM:
pnp_printf(buffer, " %#llx-%#llx\n",
(unsigned long long) res->start, (unsigned long long) res->start,
(unsigned long long) res->end); (unsigned long long) res->end);
} break;
for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) { case IORESOURCE_IRQ:
pnp_printf(buffer, "mem"); case IORESOURCE_DMA:
if (res->flags & IORESOURCE_DISABLED)
pnp_printf(buffer, " disabled\n");
else
pnp_printf(buffer, " 0x%llx-0x%llx\n",
(unsigned long long) res->start,
(unsigned long long) res->end);
}
for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IRQ, i)); i++) {
pnp_printf(buffer, "irq");
if (res->flags & IORESOURCE_DISABLED)
pnp_printf(buffer, " disabled\n");
else
pnp_printf(buffer, " %lld\n",
(unsigned long long) res->start);
}
for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_DMA, i)); i++) {
pnp_printf(buffer, "dma");
if (res->flags & IORESOURCE_DISABLED)
pnp_printf(buffer, " disabled\n");
else
pnp_printf(buffer, " %lld\n", pnp_printf(buffer, " %lld\n",
(unsigned long long) res->start); (unsigned long long) res->start);
break;
}
} }
ret = (buffer->curr - buf); ret = (buffer->curr - buf);
kfree(buffer); kfree(buffer);
return ret; return ret;