PNP: remove pnp_resource.index

[linux-2.6] / drivers / pnp / support.c

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 3eba85ed729cfb28634e9bdc65f91adb066080c8..7f594ccf49580072008ea6570f1ff4b323187522 100644 (file)
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -45,10 +45,10 @@ void pnp_eisa_id_to_string(u32 id, char *str)
        str[0] = 'A' + ((id >> 26) & 0x3f) - 1;
        str[1] = 'A' + ((id >> 21) & 0x1f) - 1;
        str[2] = 'A' + ((id >> 16) & 0x1f) - 1;
-       str[3] = hex_asc((id >> 12) & 0xf);
-       str[4] = hex_asc((id >>  8) & 0xf);
-       str[5] = hex_asc((id >>  4) & 0xf);
-       str[6] = hex_asc((id >>  0) & 0xf);
+       str[3] = hex_asc_hi(id >> 8);
+       str[4] = hex_asc_lo(id >> 8);
+       str[5] = hex_asc_hi(id);
+       str[6] = hex_asc_lo(id);
        str[7] = '\0';
 }
 
@@ -63,28 +63,46 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
        for (i = 0; i < PNP_MAX_IRQ; i++) {
                res = pnp_get_resource(dev, IORESOURCE_IRQ, i);
                if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  irq %lld flags %#lx\n",
-                               (unsigned long long) res->start, res->flags);
+                       dev_dbg(&dev->dev, "  irq %lld flags %#lx%s%s\n",
+                               (unsigned long long) res->start, res->flags,
+                               res->flags & IORESOURCE_DISABLED ?
+                                       " DISABLED" : "",
+                               res->flags & IORESOURCE_AUTO ?
+                                       " AUTO" : "");
        }
        for (i = 0; i < PNP_MAX_DMA; i++) {
                res = pnp_get_resource(dev, IORESOURCE_DMA, i);
                if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  dma %lld flags %#lx\n",
-                               (unsigned long long) res->start, res->flags);
+                       dev_dbg(&dev->dev, "  dma %lld flags %#lx%s%s\n",
+                               (unsigned long long) res->start, res->flags,
+                               res->flags & IORESOURCE_DISABLED ?
+                                       " DISABLED" : "",
+                               res->flags & IORESOURCE_AUTO ?
+                                       " AUTO" : "");
        }
        for (i = 0; i < PNP_MAX_PORT; i++) {
                res = pnp_get_resource(dev, IORESOURCE_IO, i);
                if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  io  %#llx-%#llx flags %#lx\n",
+                       dev_dbg(&dev->dev, "  io  %#llx-%#llx flags %#lx"
+                               "%s%s\n",
                                (unsigned long long) res->start,
-                               (unsigned long long) res->end, res->flags);
+                               (unsigned long long) res->end, res->flags,
+                               res->flags & IORESOURCE_DISABLED ?
+                                       " DISABLED" : "",
+                               res->flags & IORESOURCE_AUTO ?
+                                       " AUTO" : "");
        }
        for (i = 0; i < PNP_MAX_MEM; i++) {
                res = pnp_get_resource(dev, IORESOURCE_MEM, i);
                if (res && !(res->flags & IORESOURCE_UNSET))
-                       dev_dbg(&dev->dev, "  mem %#llx-%#llx flags %#lx\n",
+                       dev_dbg(&dev->dev, "  mem %#llx-%#llx flags %#lx"
+                               "%s%s\n",
                                (unsigned long long) res->start,
-                               (unsigned long long) res->end, res->flags);
+                               (unsigned long long) res->end, res->flags,
+                               res->flags & IORESOURCE_DISABLED ?
+                                       " DISABLED" : "",
+                               res->flags & IORESOURCE_AUTO ?
+                                       " AUTO" : "");
        }
 #endif
 }