adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] IOC3/IOC4: PCI mem space resources

Browse source 
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>
This commit is contained in:
Brent Casavant 2007-02-10 01:44:46 -08:00 committed by Linus Torvalds
parent 24fa509614
commit 52c9ae0ac7
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/misc/ioc4.c
View file

@ -309,7 +309,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
ret = -ENODEV; ret = -ENODEV;
goto out_pci; goto out_pci;
} }
if (!request_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs), if (!request_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs),
"ioc4_misc")) { "ioc4_misc")) {
printk(KERN_WARNING printk(KERN_WARNING
"%s: Unable to request IOC4 misc region " "%s: Unable to request IOC4 misc region "
@ -379,7 +379,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
return 0; return 0;
out_misc_region: out_misc_region:
release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
out_pci: out_pci:
kfree(idd); kfree(idd);
out_idd: out_idd:
@ -418,7 +418,7 @@ ioc4_remove(struct pci_dev *pdev)
"Device removal may be incomplete.\n", "Device removal may be incomplete.\n",
__FUNCTION__, pci_name(idd->idd_pdev)); __FUNCTION__, pci_name(idd->idd_pdev));
} }
release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs)); release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
/* Disable IOC4 and relinquish */ /* Disable IOC4 and relinquish */
pci_disable_device(pdev); pci_disable_device(pdev);

6
drivers/serial/ioc4_serial.c
View file

@ -2685,7 +2685,7 @@ static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
free_irq(control->ic_irq, soft); free_irq(control->ic_irq, soft);
if (soft->is_ioc4_serial_addr) { if (soft->is_ioc4_serial_addr) {
iounmap(soft->is_ioc4_serial_addr); iounmap(soft->is_ioc4_serial_addr);
release_region((unsigned long) release_mem_region((unsigned long)
soft->is_ioc4_serial_addr, soft->is_ioc4_serial_addr,
sizeof(struct ioc4_serial)); sizeof(struct ioc4_serial));
} }
@ -2790,7 +2790,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
/* request serial registers */ /* request serial registers */
tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET; tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET;
if (!request_region(tmp_addr1, sizeof(struct ioc4_serial), if (!request_mem_region(tmp_addr1, sizeof(struct ioc4_serial),
"sioc4_uart")) { "sioc4_uart")) {
printk(KERN_WARNING printk(KERN_WARNING
"ioc4 (%p): unable to get request region for " "ioc4 (%p): unable to get request region for "
@ -2889,7 +2889,7 @@ out3:
out2: out2:
if (serial) if (serial)
iounmap(serial); iounmap(serial);
release_region(tmp_addr1, sizeof(struct ioc4_serial)); release_mem_region(tmp_addr1, sizeof(struct ioc4_serial));
out1: out1:
return ret; return ret;

6
drivers/sn/ioc3.c
View file

@ -654,7 +654,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
ret = -ENODEV; ret = -ENODEV;
goto out_pci; goto out_pci;
} }
if (!request_region(idd->pma, IOC3_PCI_SIZE, "ioc3")) { if (!request_mem_region(idd->pma, IOC3_PCI_SIZE, "ioc3")) {
printk(KERN_WARNING printk(KERN_WARNING
"%s: Unable to request IOC3 region " "%s: Unable to request IOC3 region "
"for pci_dev %s.\n", "for pci_dev %s.\n",
@ -744,7 +744,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
return 0; return 0;
out_misc_region: out_misc_region:
release_region(idd->pma, IOC3_PCI_SIZE); release_mem_region(idd->pma, IOC3_PCI_SIZE);
out_pci: out_pci:
kfree(idd); kfree(idd);
out_idd: out_idd:
@ -785,7 +785,7 @@ static void ioc3_remove(struct pci_dev *pdev)
if(idd->dual_irq) if(idd->dual_irq)
free_irq(idd->irq_eth, (void *)idd); free_irq(idd->irq_eth, (void *)idd);
iounmap(idd->vma); iounmap(idd->vma);
release_region(idd->pma, IOC3_PCI_SIZE); release_mem_region(idd->pma, IOC3_PCI_SIZE);
/* Disable IOC3 and relinquish */ /* Disable IOC3 and relinquish */
pci_disable_device(pdev); pci_disable_device(pdev);