aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/resource.c
diff options
context:
space:
mode:
authorRene Herman <rene.herman@keyaccess.nl>2008-10-16 01:03:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:45 -0400
commitb563cf59c4d67da7d671788a9848416bfa4180ab (patch)
tree0b67e9264962cc216ac0d3aeed1b2fa0e8d65a8b /drivers/pnp/resource.c
parenta63cc18f02b941662ca5f6c33adca1aa9e8c1a96 (diff)
pnp: make the resource type an unsigned long
PnP encodes the resource type directly as its struct resource->flags value which is an unsigned long. Make it so... Signed-off-by: Rene Herman <rene.herman@gmail.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pnp/resource.c')
-rw-r--r--drivers/pnp/resource.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 4cfe3a1efdfb..dbae23acdd5b 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -467,14 +467,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
467#endif 467#endif
468} 468}
469 469
470int pnp_resource_type(struct resource *res) 470unsigned long pnp_resource_type(struct resource *res)
471{ 471{
472 return res->flags & (IORESOURCE_IO | IORESOURCE_MEM | 472 return res->flags & (IORESOURCE_IO | IORESOURCE_MEM |
473 IORESOURCE_IRQ | IORESOURCE_DMA); 473 IORESOURCE_IRQ | IORESOURCE_DMA);
474} 474}
475 475
476struct resource *pnp_get_resource(struct pnp_dev *dev, 476struct resource *pnp_get_resource(struct pnp_dev *dev,
477 unsigned int type, unsigned int num) 477 unsigned long type, unsigned int num)
478{ 478{
479 struct pnp_resource *pnp_res; 479 struct pnp_resource *pnp_res;
480 struct resource *res; 480 struct resource *res;