adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

pnp: make the resource type an unsigned long

Browse source 
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>
This commit is contained in:
Rene Herman 2008-10-15 22:03:58 -07:00 committed by Linus Torvalds
parent a63cc18f02
commit b563cf59c4
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/pnp/base.h
View file

@ -147,7 +147,7 @@ char *pnp_resource_type_name(struct resource *res);
void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc); void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
void pnp_free_resources(struct pnp_dev *dev); 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 pnp_resource {
struct list_head list; struct list_head list;

2
drivers/pnp/quirks.c
View file

@ -245,7 +245,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
*/ */
for_each_pci_dev(pdev) { for_each_pci_dev(pdev) {
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
unsigned int type; unsigned long type;
type = pci_resource_flags(pdev, i) & type = pci_resource_flags(pdev, i) &
(IORESOURCE_IO | IORESOURCE_MEM); (IORESOURCE_IO | IORESOURCE_MEM);

4
drivers/pnp/resource.c
View file

@ -467,14 +467,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
#endif #endif
} }
int pnp_resource_type(struct resource *res) unsigned long pnp_resource_type(struct resource *res)
{ {
return res->flags & (IORESOURCE_IO | IORESOURCE_MEM | return res->flags & (IORESOURCE_IO | IORESOURCE_MEM |
IORESOURCE_IRQ | IORESOURCE_DMA); IORESOURCE_IRQ | IORESOURCE_DMA);
} }
struct resource *pnp_get_resource(struct pnp_dev *dev, 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 pnp_resource *pnp_res;
struct resource *res; struct resource *res;

6
include/linux/pnp.h
View file

@ -22,9 +22,11 @@ struct pnp_dev;
* Resource Management * Resource Management
*/ */
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int); struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned long type,
unsigned int num);
#else #else
static inline struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned int type, unsigned int num) static inline struct resource *pnp_get_resource(struct pnp_dev *dev,
unsigned long type, unsigned int num)
{ {
return NULL; return NULL;
} }