IOC3/IOC4: PCI mem space resources
Subsystems (2)
PATCH 1/1 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 <[email protected]>
---
I'd appreciate a review/ack by the MIPS folks, just in case I'm unaware of something special on those systems.
misc/ioc4.c | 6 +++--- serial/ioc4_serial.c | 6 +++--- sn/ioc3.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
---
drivers/misc/ioc4.c +3 -3
@@ -309,7 +309,7 @@ ioc4_probe(struct pci_dev *pdev, const s ret = -ENODEV ; 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" )) {printk (KERN_WARNING "%s: Unable to request IOC4 misc region "
@@ -379,7 +379,7 @@ ioc4_probe(struct pci_dev *pdev, const sreturn 0 ; 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:kfree (idd); out_idd:
@@ -418,7 +418,7 @@ ioc4_remove(struct pci_dev *pdev)"Device removal may be incomplete.\n" , __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 */ pci_disable_device (pdev);
drivers/serial/ioc4_serial.c +3 -3
@@ -2685,7 +2685,7 @@ static int ioc4_serial_remove_one(structfree_irq (control->ic_irq, soft);if (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,sizeof (struct ioc4_serial )); }
@@ -2790,7 +2790,7 @@ ioc4_serial_attach_one(struct ioc4_drive/* request serial registers */ 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" )) {printk (KERN_WARNING "ioc4 (%p): unable to get request region for "
@@ -2889,7 +2889,7 @@ out3: out2:if (serial)iounmap (serial); -release_region (tmp_addr1,sizeof (struct ioc4_serial )); +release_mem_region (tmp_addr1,sizeof (struct ioc4_serial )); out1:return ret;
drivers/sn/ioc3.c +3 -3
@@ -654,7 +654,7 @@ #endif ret = -ENODEV ; 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 "%s: Unable to request IOC3 region " "for pci_dev %s.\n",
@@ -744,7 +744,7 @@ #endifreturn 0 ; out_misc_region: -release_region (idd->pma,IOC3_PCI_SIZE ); +release_mem_region (idd->pma,IOC3_PCI_SIZE ); out_pci:kfree (idd); out_idd:
@@ -785,7 +785,7 @@ static void ioc3_remove(struct pci_dev *if (idd->dual_irq)free_irq (idd->irq_eth, (void *)idd);iounmap (idd->vma); -release_region (idd->pma,IOC3_PCI_SIZE ); +release_mem_region (idd->pma,IOC3_PCI_SIZE );/* Disable IOC3 and relinquish */ pci_disable_device (pdev);