aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pnp/base.h3
-rw-r--r--drivers/pnp/resource.c24
2 files changed, 21 insertions, 6 deletions
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 1d6bb351d323..49b4138f3476 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -21,6 +21,9 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
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
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 7e9f4300e5f6..c57cfe51d52a 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -499,8 +499,8 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
#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 @@ struct resource *pnp_get_resource(struct pnp_dev *dev,
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] .... */

Privacy Policy