diff options
author | Brent Casavant <bcasavan@sgi.com> | 2007-02-10 04:44:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:25 -0500 |
commit | 52c9ae0ac7576c94f6a2371b44039e7ba12a0439 (patch) | |
tree | 45753628a889d476e527b15191a84f1208ea8895 /drivers/misc | |
parent | 24fa50961451b7b21081e4d16836952b17eb5fb3 (diff) |
[PATCH] IOC3/IOC4: PCI mem space resources
The SGI IOC3 and IOC4 PCI devices implement memory space apertures, not I/O
space apertures. Use the appropriate region management functions.
Signed-off-by: Brent Casavant <bcasavan@sgi.com>
Cc: Pat Gefre <pfg@sgi.com>
Cc: Stanislaw Skowronek <skylark@linux-mips.org>
Cc: Brent Casavant <bcasavan@sgi.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/ioc4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c index b995a15b7526..6a5a05d1f392 100644 --- a/drivers/misc/ioc4.c +++ b/drivers/misc/ioc4.c | |||
@@ -309,7 +309,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
309 | ret = -ENODEV; | 309 | ret = -ENODEV; |
310 | goto out_pci; | 310 | goto out_pci; |
311 | } | 311 | } |
312 | if (!request_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs), | 312 | if (!request_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs), |
313 | "ioc4_misc")) { | 313 | "ioc4_misc")) { |
314 | printk(KERN_WARNING | 314 | printk(KERN_WARNING |
315 | "%s: Unable to request IOC4 misc region " | 315 | "%s: Unable to request IOC4 misc region " |
@@ -379,7 +379,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
379 | return 0; | 379 | return 0; |
380 | 380 | ||
381 | out_misc_region: | 381 | out_misc_region: |
382 | release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); | 382 | release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); |
383 | out_pci: | 383 | out_pci: |
384 | kfree(idd); | 384 | kfree(idd); |
385 | out_idd: | 385 | out_idd: |
@@ -418,7 +418,7 @@ ioc4_remove(struct pci_dev *pdev) | |||
418 | "Device removal may be incomplete.\n", | 418 | "Device removal may be incomplete.\n", |
419 | __FUNCTION__, pci_name(idd->idd_pdev)); | 419 | __FUNCTION__, pci_name(idd->idd_pdev)); |
420 | } | 420 | } |
421 | release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); | 421 | release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); |
422 | 422 | ||
423 | /* Disable IOC4 and relinquish */ | 423 | /* Disable IOC4 and relinquish */ |
424 | pci_disable_device(pdev); | 424 | pci_disable_device(pdev); |