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/serial | |
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/serial')
-rw-r--r-- | drivers/serial/ioc4_serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
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: | |||
2889 | out2: | 2889 | out2: |
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)); |
2893 | out1: | 2893 | out1: |
2894 | 2894 | ||
2895 | return ret; | 2895 | return ret; |