PNP: convert assign, interface to use pnp_get_resource(), not pnp_resource_table

[linux-2.6-omap-h63xx.git] / drivers / pnp / support.c

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 3aeb154e27d6be240642f9c98d03a796e4a774a4..3eba85ed729cfb28634e9bdc65f91adb066080c8 100644 (file)
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -61,27 +61,27 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
        dev_dbg(&dev->dev, "current resources: %s\n", desc);
 
        for (i = 0; i < PNP_MAX_IRQ; i++) {
-               res = &dev->res.irq_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               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);
        }
        for (i = 0; i < PNP_MAX_DMA; i++) {
-               res = &dev->res.dma_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               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);
        }
        for (i = 0; i < PNP_MAX_PORT; i++) {
-               res = &dev->res.port_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               res = pnp_get_resource(dev, IORESOURCE_IO, i);
+               if (res && !(res->flags & IORESOURCE_UNSET))
                        dev_dbg(&dev->dev, "  io  %#llx-%#llx flags %#lx\n",
                                (unsigned long long) res->start,
                                (unsigned long long) res->end, res->flags);
        }
        for (i = 0; i < PNP_MAX_MEM; i++) {
-               res = &dev->res.mem_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               res = pnp_get_resource(dev, IORESOURCE_MEM, i);
+               if (res && !(res->flags & IORESOURCE_UNSET))
                        dev_dbg(&dev->dev, "  mem %#llx-%#llx flags %#lx\n",
                                (unsigned long long) res->start,
                                (unsigned long long) res->end, res->flags);