diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-10 13:40:51 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-11 12:19:02 -0400 |
commit | 10bdaaa0fad620145cf10e2b573266b2d80b44de (patch) | |
tree | 8d3200f5041ab0fdc72e9245ef780310b27a18d8 /drivers/serial | |
parent | c7b87f3d5037a35b5c7bb916ffc826be3fcb208d (diff) |
[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()
Add devres ecardm_iomap() and ecardm_iounmap() for Acorn expansion
cards. Convert all expansion card drivers to use them.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250_acorn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/8250_acorn.c b/drivers/serial/8250_acorn.c index 562ba745a044..b0ce8c56f1a4 100644 --- a/drivers/serial/8250_acorn.c +++ b/drivers/serial/8250_acorn.c | |||
@@ -54,7 +54,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
54 | info->num_ports = type->num_ports; | 54 | info->num_ports = type->num_ports; |
55 | 55 | ||
56 | bus_addr = ecard_resource_start(ec, type->type); | 56 | bus_addr = ecard_resource_start(ec, type->type); |
57 | info->vaddr = ioremap(bus_addr, ecard_resource_len(ec, type->type)); | 57 | info->vaddr = ecardm_iomap(ec, type->type, 0, 0); |
58 | if (!info->vaddr) { | 58 | if (!info->vaddr) { |
59 | kfree(info); | 59 | kfree(info); |
60 | return -ENOMEM; | 60 | return -ENOMEM; |
@@ -91,7 +91,6 @@ static void __devexit serial_card_remove(struct expansion_card *ec) | |||
91 | if (info->ports[i] > 0) | 91 | if (info->ports[i] > 0) |
92 | serial8250_unregister_port(info->ports[i]); | 92 | serial8250_unregister_port(info->ports[i]); |
93 | 93 | ||
94 | iounmap(info->vaddr); | ||
95 | kfree(info); | 94 | kfree(info); |
96 | } | 95 | } |
97 | 96 | ||