>From c54f1a8a4d82a5b2891c3b15c9935ba5f8ece531 Mon Sep 17 00:00:00 2001 From: Rene Herman Date: Thu, 26 Jun 2008 00:14:08 +0200 Subject: [PATCH] PNP: make the resource type an unsigned long PnP encodes the resource type directly as it's struct resource->flags value which is an unsigned long. Make it so... Signed-off-by: Rene Herman --- drivers/pnp/base.h | 2 +- drivers/pnp/resource.c | 4 ++-- include/linux/pnp.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h index e3fa9a2..45690ff 100644 --- a/drivers/pnp/base.h +++ b/drivers/pnp/base.h @@ -148,7 +148,7 @@ char *pnp_resource_type_name(struct resource *res); void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc); void pnp_free_resources(struct pnp_dev *dev); -int pnp_resource_type(struct resource *res); +unsigned long pnp_resource_type(struct resource *res); struct pnp_resource { struct list_head list; diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index e0e853d..5d27df1 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -468,14 +468,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res) #endif } -int pnp_resource_type(struct resource *res) +unsigned long pnp_resource_type(struct resource *res) { return res->flags & (IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_IRQ | IORESOURCE_DMA); } struct resource *pnp_get_resource(struct pnp_dev *dev, - unsigned int type, unsigned int num) + unsigned long type, unsigned int num) { struct pnp_resource *pnp_res; struct resource *res; diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 116abdc..c2e844c 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -21,7 +21,7 @@ struct pnp_dev; /* * Resource Management */ -struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int); +struct resource *pnp_get_resource(struct pnp_dev *, unsigned long, unsigned int); static inline int pnp_resource_valid(struct resource *res) { -- 1.5.5