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/sn | |
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/sn')
-rw-r--r-- | drivers/sn/ioc3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index cd6b65333b71..2dd6eed50aa0 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c | |||
@@ -654,7 +654,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
654 | ret = -ENODEV; | 654 | ret = -ENODEV; |
655 | goto out_pci; | 655 | goto out_pci; |
656 | } | 656 | } |
657 | if (!request_region(idd->pma, IOC3_PCI_SIZE, "ioc3")) { | 657 | if (!request_mem_region(idd->pma, IOC3_PCI_SIZE, "ioc3")) { |
658 | printk(KERN_WARNING | 658 | printk(KERN_WARNING |
659 | "%s: Unable to request IOC3 region " | 659 | "%s: Unable to request IOC3 region " |
660 | "for pci_dev %s.\n", | 660 | "for pci_dev %s.\n", |
@@ -744,7 +744,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
744 | return 0; | 744 | return 0; |
745 | 745 | ||
746 | out_misc_region: | 746 | out_misc_region: |
747 | release_region(idd->pma, IOC3_PCI_SIZE); | 747 | release_mem_region(idd->pma, IOC3_PCI_SIZE); |
748 | out_pci: | 748 | out_pci: |
749 | kfree(idd); | 749 | kfree(idd); |
750 | out_idd: | 750 | out_idd: |
@@ -785,7 +785,7 @@ static void ioc3_remove(struct pci_dev *pdev) | |||
785 | if(idd->dual_irq) | 785 | if(idd->dual_irq) |
786 | free_irq(idd->irq_eth, (void *)idd); | 786 | free_irq(idd->irq_eth, (void *)idd); |
787 | iounmap(idd->vma); | 787 | iounmap(idd->vma); |
788 | release_region(idd->pma, IOC3_PCI_SIZE); | 788 | release_mem_region(idd->pma, IOC3_PCI_SIZE); |
789 | 789 | ||
790 | /* Disable IOC3 and relinquish */ | 790 | /* Disable IOC3 and relinquish */ |
791 | pci_disable_device(pdev); | 791 | pci_disable_device(pdev); |