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/ide/arm/rapide.c | |
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/ide/arm/rapide.c')
-rw-r--r-- | drivers/ide/arm/rapide.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c index 890ea3fac3c6..83811af11610 100644 --- a/drivers/ide/arm/rapide.c +++ b/drivers/ide/arm/rapide.c | |||
@@ -63,8 +63,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
63 | if (ret) | 63 | if (ret) |
64 | goto out; | 64 | goto out; |
65 | 65 | ||
66 | base = ioremap(ecard_resource_start(ec, ECARD_RES_MEMC), | 66 | base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); |
67 | ecard_resource_len(ec, ECARD_RES_MEMC)); | ||
68 | if (!base) { | 67 | if (!base) { |
69 | ret = -ENOMEM; | 68 | ret = -ENOMEM; |
70 | goto release; | 69 | goto release; |
@@ -81,7 +80,6 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
81 | goto out; | 80 | goto out; |
82 | } | 81 | } |
83 | 82 | ||
84 | iounmap(base); | ||
85 | release: | 83 | release: |
86 | ecard_release_resources(ec); | 84 | ecard_release_resources(ec); |
87 | out: | 85 | out: |
@@ -96,7 +94,6 @@ static void __devexit rapide_remove(struct expansion_card *ec) | |||
96 | 94 | ||
97 | /* there must be a better way */ | 95 | /* there must be a better way */ |
98 | ide_unregister(hwif - ide_hwifs); | 96 | ide_unregister(hwif - ide_hwifs); |
99 | iounmap(hwif->hwif_data); | ||
100 | ecard_release_resources(ec); | 97 | ecard_release_resources(ec); |
101 | } | 98 | } |
102 | 99 | ||