git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
scsi
/
arm
/
cumana_2.c
diff --git
a/drivers/scsi/arm/cumana_2.c
b/drivers/scsi/arm/cumana_2.c
index
89ffb31
..
e54885f
100644
(file)
--- a/
drivers/scsi/arm/cumana_2.c
+++ b/
drivers/scsi/arm/cumana_2.c
@@
-35,7
+35,7
@@
#include <asm/pgtable.h>
#include "../scsi.h"
#include <asm/pgtable.h>
#include "../scsi.h"
-#include
"../hosts.h"
+#include
<scsi/scsi_host.h>
#include "fas216.h"
#include "scsi.h"
#include "fas216.h"
#include "scsi.h"
@@
-408,14
+408,12
@@
cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
unsigned char *base;
int ret;
unsigned char *base;
int ret;
- resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
- reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
-
- if (!request_mem_region(resbase, reslen, "cumanascsi2")) {
- ret = -EBUSY;
+ ret = ecard_request_resources(ec);
+ if (ret)
goto out;
goto out;
- }
+ resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
+ reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
base = ioremap(resbase, reslen);
if (!base) {
ret = -ENOMEM;
base = ioremap(resbase, reslen);
if (!base) {
ret = -ENOMEM;
@@
-504,7
+502,7
@@
cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
iounmap(base);
out_region:
iounmap(base);
out_region:
-
release_mem_region(resbase, reslen
);
+
ecard_release_resources(ec
);
out:
return ret;
out:
return ret;
@@
-514,7
+512,6
@@
static void __devexit cumanascsi2_remove(struct expansion_card *ec)
{
struct Scsi_Host *host = ecard_get_drvdata(ec);
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
{
struct Scsi_Host *host = ecard_get_drvdata(ec);
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
- unsigned long resbase, reslen;
ecard_set_drvdata(ec, NULL);
fas216_remove(host);
ecard_set_drvdata(ec, NULL);
fas216_remove(host);
@@
-525,13
+522,9
@@
static void __devexit cumanascsi2_remove(struct expansion_card *ec)
iounmap((void *)host->base);
iounmap((void *)host->base);
- resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
- reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
-
- release_mem_region(resbase, reslen);
-
fas216_release(host);
scsi_host_put(host);
fas216_release(host);
scsi_host_put(host);
+ ecard_release_resources(ec);
}
static const struct ecard_id cumanascsi2_cids[] = {
}
static const struct ecard_id cumanascsi2_cids[] = {