projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing/core-v2' into tracing-for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
arm
/
arxescsi.c
diff --git
a/drivers/scsi/arm/arxescsi.c
b/drivers/scsi/arm/arxescsi.c
index 7e132c5bacf83a705bdfcf767b5e93c78de7155e..2836fe248df9ef5ab1cc42a939e468ec0602bfe3 100644
(file)
--- a/
drivers/scsi/arm/arxescsi.c
+++ b/
drivers/scsi/arm/arxescsi.c
@@
-281,7
+281,6
@@
arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
{
struct Scsi_Host *host;
struct arxescsi_info *info;
{
struct Scsi_Host *host;
struct arxescsi_info *info;
- unsigned long resbase, reslen;
void __iomem *base;
int ret;
void __iomem *base;
int ret;
@@
-289,9
+288,7
@@
arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
if (ret)
goto out;
if (ret)
goto out;
- resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
- reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
- base = ioremap(resbase, reslen);
+ base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
if (!base) {
ret = -ENOMEM;
goto out_region;
if (!base) {
ret = -ENOMEM;
goto out_region;
@@
-300,7
+297,7
@@
arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
host = scsi_host_alloc(&arxescsi_template, sizeof(struct arxescsi_info));
if (!host) {
ret = -ENOMEM;
host = scsi_host_alloc(&arxescsi_template, sizeof(struct arxescsi_info));
if (!host) {
ret = -ENOMEM;
- goto out_
unmap
;
+ goto out_
region
;
}
info = (struct arxescsi_info *)host->hostdata;
}
info = (struct arxescsi_info *)host->hostdata;
@@
-337,8
+334,6
@@
arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
fas216_release(host);
out_unregister:
scsi_host_put(host);
fas216_release(host);
out_unregister:
scsi_host_put(host);
- out_unmap:
- iounmap(base);
out_region:
ecard_release_resources(ec);
out:
out_region:
ecard_release_resources(ec);
out:
@@
-348,13
+343,10
@@
arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
static void __devexit arxescsi_remove(struct expansion_card *ec)
{
struct Scsi_Host *host = ecard_get_drvdata(ec);
static void __devexit arxescsi_remove(struct expansion_card *ec)
{
struct Scsi_Host *host = ecard_get_drvdata(ec);
- struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
ecard_set_drvdata(ec, NULL);
fas216_remove(host);
ecard_set_drvdata(ec, NULL);
fas216_remove(host);
- iounmap(info->base);
-
fas216_release(host);
scsi_host_put(host);
ecard_release_resources(ec);
fas216_release(host);
scsi_host_put(host);
ecard_release_resources(ec);