[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>
This commit is contained in:

committed by
Linus Torvalds

parent
24fa509614
commit
52c9ae0ac7
@@ -2685,7 +2685,7 @@ static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
|
||||
free_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_driver_data *idd)
|
||||
/* 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;
|
||||
|
Reference in New Issue
Block a user