[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>
This commit is contained in:
committed by
Russell King
parent
c7b87f3d50
commit
10bdaaa0fa
@@ -519,7 +519,6 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
{
|
||||
struct Scsi_Host *host;
|
||||
struct eesoxscsi_info *info;
|
||||
unsigned long resbase, reslen;
|
||||
void __iomem *base;
|
||||
int ret;
|
||||
|
||||
@@ -527,9 +526,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
resbase = ecard_resource_start(ec, ECARD_RES_IOCFAST);
|
||||
reslen = ecard_resource_len(ec, ECARD_RES_IOCFAST);
|
||||
base = ioremap(resbase, reslen);
|
||||
base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
|
||||
if (!base) {
|
||||
ret = -ENOMEM;
|
||||
goto out_region;
|
||||
@@ -539,7 +536,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
sizeof(struct eesoxscsi_info));
|
||||
if (!host) {
|
||||
ret = -ENOMEM;
|
||||
goto out_unmap;
|
||||
goto out_region;
|
||||
}
|
||||
|
||||
ecard_set_drvdata(ec, host);
|
||||
@@ -612,9 +609,6 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
|
||||
device_remove_file(&ec->dev, &dev_attr_bus_term);
|
||||
scsi_host_put(host);
|
||||
|
||||
out_unmap:
|
||||
iounmap(base);
|
||||
|
||||
out_region:
|
||||
ecard_release_resources(ec);
|
||||
|
||||
@@ -636,8 +630,6 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
|
||||
|
||||
device_remove_file(&ec->dev, &dev_attr_bus_term);
|
||||
|
||||
iounmap(info->base);
|
||||
|
||||
fas216_release(host);
|
||||
scsi_host_put(host);
|
||||
ecard_release_resources(ec);
|
||||
|
Reference in New Issue
Block a user