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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
aacraid
/
comminit.c
diff --git
a/drivers/scsi/aacraid/comminit.c
b/drivers/scsi/aacraid/comminit.c
index
1cd3584
..
6d305b2
100644
(file)
--- a/
drivers/scsi/aacraid/comminit.c
+++ b/
drivers/scsi/aacraid/comminit.c
@@
-180,7
+180,7
@@
int aac_send_shutdown(struct aac_dev * dev)
-2 /* Timeout silently */, 1,
NULL, NULL);
-2 /* Timeout silently */, 1,
NULL, NULL);
- if (status
=
= 0)
+ if (status
>
= 0)
aac_fib_complete(fibctx);
aac_fib_free(fibctx);
return status;
aac_fib_complete(fibctx);
aac_fib_free(fibctx);
return status;
@@
-307,17
+307,12
@@
struct aac_dev *aac_init_adapter(struct aac_dev *dev)
if (status[1] & AAC_OPT_NEW_COMM)
dev->new_comm_interface = dev->a_ops.adapter_send != 0;
if (dev->new_comm_interface && (status[2] > dev->base_size)) {
if (status[1] & AAC_OPT_NEW_COMM)
dev->new_comm_interface = dev->a_ops.adapter_send != 0;
if (dev->new_comm_interface && (status[2] > dev->base_size)) {
-
iounmap(dev->regs.sa
);
+
aac_adapter_ioremap(dev, 0
);
dev->base_size = status[2];
dev->base_size = status[2];
- dprintk((KERN_DEBUG "ioremap(%lx,%d)\n",
- host->base, status[2]));
- dev->regs.sa = ioremap(host->base, status[2]);
- if (dev->regs.sa == NULL) {
+ if (aac_adapter_ioremap(dev, status[2])) {
/* remap failed, go back ... */
dev->new_comm_interface = 0;
/* remap failed, go back ... */
dev->new_comm_interface = 0;
- dev->regs.sa = ioremap(host->base,
- AAC_MIN_FOOTPRINT_SIZE);
- if (dev->regs.sa == NULL) {
+ if (aac_adapter_ioremap(dev, AAC_MIN_FOOTPRINT_SIZE)) {
printk(KERN_WARNING
"aacraid: unable to map adapter.\n");
return NULL;
printk(KERN_WARNING
"aacraid: unable to map adapter.\n");
return NULL;
@@
-391,7
+386,7
@@
struct aac_dev *aac_init_adapter(struct aac_dev *dev)
* Ok now init the communication subsystem
*/
* Ok now init the communication subsystem
*/
- dev->queues =
(struct aac_queue_block *)
kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
+ dev->queues = kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
if (dev->queues == NULL) {
printk(KERN_ERR "Error could not allocate comm region.\n");
return NULL;
if (dev->queues == NULL) {
printk(KERN_ERR "Error could not allocate comm region.\n");
return NULL;