diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 20:07:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 12:24:00 -0400 |
commit | b60ba8343b78b182c03cf239d4342785376c1ad1 (patch) | |
tree | 4285a89db0427674a51b76107321bfa95a63ddbd /drivers/pnp/resource.c | |
parent | e31dd6e4520439ceae4753f32dd2da2c345e929a (diff) |
[PATCH] 64bit resource: change pnp core to use resource_size_t
Based on a patch series originally from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pnp/resource.c')
-rw-r--r-- | drivers/pnp/resource.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 6ded527169f4..7bb892f58cc0 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c | |||
@@ -241,7 +241,7 @@ int pnp_check_port(struct pnp_dev * dev, int idx) | |||
241 | { | 241 | { |
242 | int tmp; | 242 | int tmp; |
243 | struct pnp_dev *tdev; | 243 | struct pnp_dev *tdev; |
244 | unsigned long *port, *end, *tport, *tend; | 244 | resource_size_t *port, *end, *tport, *tend; |
245 | port = &dev->res.port_resource[idx].start; | 245 | port = &dev->res.port_resource[idx].start; |
246 | end = &dev->res.port_resource[idx].end; | 246 | end = &dev->res.port_resource[idx].end; |
247 | 247 | ||
@@ -297,7 +297,7 @@ int pnp_check_mem(struct pnp_dev * dev, int idx) | |||
297 | { | 297 | { |
298 | int tmp; | 298 | int tmp; |
299 | struct pnp_dev *tdev; | 299 | struct pnp_dev *tdev; |
300 | unsigned long *addr, *end, *taddr, *tend; | 300 | resource_size_t *addr, *end, *taddr, *tend; |
301 | addr = &dev->res.mem_resource[idx].start; | 301 | addr = &dev->res.mem_resource[idx].start; |
302 | end = &dev->res.mem_resource[idx].end; | 302 | end = &dev->res.mem_resource[idx].end; |
303 | 303 | ||
@@ -358,7 +358,7 @@ int pnp_check_irq(struct pnp_dev * dev, int idx) | |||
358 | { | 358 | { |
359 | int tmp; | 359 | int tmp; |
360 | struct pnp_dev *tdev; | 360 | struct pnp_dev *tdev; |
361 | unsigned long * irq = &dev->res.irq_resource[idx].start; | 361 | resource_size_t * irq = &dev->res.irq_resource[idx].start; |
362 | 362 | ||
363 | /* if the resource doesn't exist, don't complain about it */ | 363 | /* if the resource doesn't exist, don't complain about it */ |
364 | if (cannot_compare(dev->res.irq_resource[idx].flags)) | 364 | if (cannot_compare(dev->res.irq_resource[idx].flags)) |
@@ -423,7 +423,7 @@ int pnp_check_dma(struct pnp_dev * dev, int idx) | |||
423 | #ifndef CONFIG_IA64 | 423 | #ifndef CONFIG_IA64 |
424 | int tmp; | 424 | int tmp; |
425 | struct pnp_dev *tdev; | 425 | struct pnp_dev *tdev; |
426 | unsigned long * dma = &dev->res.dma_resource[idx].start; | 426 | resource_size_t * dma = &dev->res.dma_resource[idx].start; |
427 | 427 | ||
428 | /* if the resource doesn't exist, don't complain about it */ | 428 | /* if the resource doesn't exist, don't complain about it */ |
429 | if (cannot_compare(dev->res.dma_resource[idx].flags)) | 429 | if (cannot_compare(dev->res.dma_resource[idx].flags)) |