aboutsummaryrefslogtreecommitdiff
path: root/drivers/pnp/resource.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 16:34:22 -0600
committerLen Brown <len.brown@intel.com>2008-04-29 03:22:25 -0400
commitf5d94ff014cb7e6212f40fc6644f3fd68507df33 (patch)
treedc370a5b6167a5d325beb3536309e3953d1976a2 /drivers/pnp/resource.c
parentdb9eaeab3e7ab72d773820820f1ba33960ad24c4 (diff)
PNP: pass resources, not indexes, to pnp_check_port(), et al
The caller already has the struct resource pointer, so no need for pnp_check_port(), pnp_check_mem(), etc., to look it up again. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-By: Rene Herman <rene.herman@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/resource.c')
-rw-r--r--drivers/pnp/resource.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index eab16e5520a..93bf45e01f2 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -239,14 +239,13 @@ void pnp_free_option(struct pnp_option *option)
#define cannot_compare(flags) \
((flags) & (IORESOURCE_UNSET | IORESOURCE_DISABLED))
-int pnp_check_port(struct pnp_dev *dev, int idx)
+int pnp_check_port(struct pnp_dev *dev, struct resource *res)
{
int i;
struct pnp_dev *tdev;
- struct resource *res, *tres;
+ struct resource *tres;
resource_size_t *port, *end, *tport, *tend;
- res = &dev->res.port_resource[idx];
port = &res->start;
end = &res->end;
@@ -300,14 +299,13 @@ int pnp_check_port(struct pnp_dev *dev, int idx)
return 1;
}
-int pnp_check_mem(struct pnp_dev *dev, int idx)
+int pnp_check_mem(struct pnp_dev *dev, struct resource *res)
{
int i;
struct pnp_dev *tdev;
- struct resource *res, *tres;
+ struct resource *tres;
resource_size_t *addr, *end, *taddr, *tend;
- res = &dev->res.mem_resource[idx];
addr = &res->start;
end = &res->end;
@@ -366,14 +364,13 @@ static irqreturn_t pnp_test_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
-int pnp_check_irq(struct pnp_dev *dev, int idx)
+int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
{
int i;
struct pnp_dev *tdev;
- struct resource *res, *tres;
+ struct resource *tres;
resource_size_t *irq;
- res = &dev->res.irq_resource[idx];
irq = &res->start;
/* if the resource doesn't exist, don't complain about it */
@@ -439,15 +436,14 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
return 1;
}
-int pnp_check_dma(struct pnp_dev *dev, int idx)
+int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
{
#ifndef CONFIG_IA64
int i;
struct pnp_dev *tdev;
- struct resource *res, *tres;
+ struct resource *tres;
resource_size_t *dma;
- res = &dev->res.dma_resource[idx];
dma = &res->start;
/* if the resource doesn't exist, don't complain about it */