[patch 44/55] PNP: add pnp_get_pnp_resource()

Bjorn Helgaas
2008-04-28T22:37:16Z

[-- Attachment #1: pnp-add-get-pnp-resource --]
[-- Type: text/plain, Size: 2376 bytes --]

In some places, we need to get the struct pnp_resource, not just
the struct resource, because ISAPNP needs to store the register
index in the pnp_resource.

I don't like pnp_get_pnp_resource() and hope that it is temporary,
but we need it for a little while.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

---
drivers/pnp/base.h | 3 +++
drivers/pnp/resource.c | 24 ++++++++++++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)

Index: work10/drivers/pnp/base.h
===================================================================
--- work10.orig/drivers/pnp/base.h 2008-04-28 16:09:43.000000000 -0600
+++ work10/drivers/pnp/base.h 2008-04-28 16:09:43.000000000 -0600
@@ -21,6 +21,9 @@

void pnp_init_resource(struct resource *res);

+struct pnp_resource *pnp_get_pnp_resource(struct pnp_dev *dev,
+ unsigned int type, unsigned int num);
+
#define PNP_MAX_PORT 40
#define PNP_MAX_MEM 24
#define PNP_MAX_IRQ 2
Index: work10/drivers/pnp/resource.c
===================================================================
--- work10.orig/drivers/pnp/resource.c 2008-04-28 16:09:43.000000000 -0600
+++ work10/drivers/pnp/resource.c 2008-04-28 16:09:43.000000000 -0600
@@ -499,8 +499,8 @@
#endif
}

-struct resource *pnp_get_resource(struct pnp_dev *dev,
- unsigned int type, unsigned int num)
+struct pnp_resource *pnp_get_pnp_resource(struct pnp_dev *dev,
+ unsigned int type, unsigned int num)
{
struct pnp_resource_table *res = dev->res;

@@ -508,22 +508,34 @@
case IORESOURCE_IO:
if (num >= PNP_MAX_PORT)
return NULL;
- return &res->port[num].res;
+ return &res->port[num];
case IORESOURCE_MEM:
if (num >= PNP_MAX_MEM)
return NULL;
- return &res->mem[num].res;
+ return &res->mem[num];
case IORESOURCE_IRQ:
if (num >= PNP_MAX_IRQ)
return NULL;
- return &res->irq[num].res;
+ return &res->irq[num];
case IORESOURCE_DMA:
if (num >= PNP_MAX_DMA)
return NULL;
- return &res->dma[num].res;
+ return &res->dma[num];
}
return NULL;
}
+
+struct resource *pnp_get_resource(struct pnp_dev *dev,
+ unsigned int type, unsigned int num)
+{
+ struct pnp_resource *pnp_res;
+
+ pnp_res = pnp_get_pnp_resource(dev, type, num);
+ if (pnp_res)
+ return &pnp_res->res;
+
+ return NULL;
+}
EXPORT_SYMBOL(pnp_get_resource);

/* format is: pnp_reserve_irq=irq1[,irq2] .... */

--