aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/ioc4.c6
-rw-r--r--drivers/serial/ioc4_serial.c6
-rw-r--r--drivers/sn/ioc3.c6
3 files changed, 9 insertions, 9 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
381out_misc_region: 381out_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));
383out_pci: 383out_pci:
384 kfree(idd); 384 kfree(idd);
385out_idd: 385out_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);
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index c862f67c985a..f540212e7409 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2685,7 +2685,7 @@ static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
2685 free_irq(control->ic_irq, soft); 2685 free_irq(control->ic_irq, soft);
2686 if (soft->is_ioc4_serial_addr) { 2686 if (soft->is_ioc4_serial_addr) {
2687 iounmap(soft->is_ioc4_serial_addr); 2687 iounmap(soft->is_ioc4_serial_addr);
2688 release_region((unsigned long) 2688 release_mem_region((unsigned long)
2689 soft->is_ioc4_serial_addr, 2689 soft->is_ioc4_serial_addr,
2690 sizeof(struct ioc4_serial)); 2690 sizeof(struct ioc4_serial));
2691 } 2691 }
@@ -2790,7 +2790,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
2790 /* request serial registers */ 2790 /* request serial registers */
2791 tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET; 2791 tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET;
2792 2792
2793 if (!request_region(tmp_addr1, sizeof(struct ioc4_serial), 2793 if (!request_mem_region(tmp_addr1, sizeof(struct ioc4_serial),
2794 "sioc4_uart")) { 2794 "sioc4_uart")) {
2795 printk(KERN_WARNING 2795 printk(KERN_WARNING
2796 "ioc4 (%p): unable to get request region for " 2796 "ioc4 (%p): unable to get request region for "
@@ -2889,7 +2889,7 @@ out3:
2889out2: 2889out2:
2890 if (serial) 2890 if (serial)
2891 iounmap(serial); 2891 iounmap(serial);
2892 release_region(tmp_addr1, sizeof(struct ioc4_serial)); 2892 release_mem_region(tmp_addr1, sizeof(struct ioc4_serial));
2893out1: 2893out1:
2894 2894
2895 return ret; 2895 return ret;
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
746out_misc_region: 746out_misc_region:
747 release_region(idd->pma, IOC3_PCI_SIZE); 747 release_mem_region(idd->pma, IOC3_PCI_SIZE);
748out_pci: 748out_pci:
749 kfree(idd); 749 kfree(idd);
750out_idd: 750out_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);