Commit f61ed7e3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Andi Kleen
Browse files

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



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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent 25d39c39

drivers/pnp/interface.c

+22 −34
Original line number Diff line number Diff line
@@ -248,8 +248,9 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, 
					  char *buf)

{

	struct pnp_dev *dev = to_pnp_dev(dmdev);

	struct pnp_resource *pnp_res;

	struct resource *res;

	int i, ret;

	int ret;

	pnp_info_buffer_t *buffer;



	if (!dev)
@@ -262,46 +263,33 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, 
	buffer->buffer = buf;

	buffer->curr = buffer->buffer;



	pnp_printf(buffer, "state = ");

	if (dev->active)

		pnp_printf(buffer, "active\n");

	else

		pnp_printf(buffer, "disabled\n");

	pnp_printf(buffer, "state = %s\n", dev->active ? "active" : "disabled");



	for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {

		pnp_printf(buffer, "io");

		if (res->flags & IORESOURCE_DISABLED)

	list_for_each_entry(pnp_res, &dev->resources, list) {

		res = &pnp_res->res;



		pnp_printf(buffer, pnp_resource_type_name(res));



		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);

			continue;

		}

	for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {

		pnp_printf(buffer, "mem");

		if (res->flags & IORESOURCE_DISABLED)

			pnp_printf(buffer, " disabled\n");

		else

			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->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

			break;

		case IORESOURCE_IRQ:

		case IORESOURCE_DMA:

			pnp_printf(buffer, " %lld\n",

				   (unsigned long long) res->start);

			break;

		}

	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",

				   (unsigned long long) res->start);

	}



	ret = (buffer->curr - buf);

	kfree(buffer);

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE