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

This removes more direct references to pnp_resource_table from the
pnp_assign_resources() path and the /sys user interface path.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 3aeb154e27d6..3eba85ed729c 100644
--- 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);