diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/scsi/hosts.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index ca7750d0c..81a94ad30 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -713,15 +713,11 @@ struct Scsi_Host * scsi_register(Scsi_Host_Template * tpnt, int j){ atomic_set(&retval->host_active,0); retval->host_busy = 0; retval->host_failed = 0; - retval->block = NULL; - retval->wish_block = 0; if(j > 0xffff) panic("Too many extra bytes requested\n"); retval->extra_bytes = j; retval->loaded_as_module = scsi_loadable_module_flag; retval->host_no = max_scsi_hosts++; /* never reuse host_no (DB) */ next_scsi_host++; - /* FIXME: what with overflows? Old code suffered from the same, BTW */ - sprintf(retval->proc_name, "%d", retval->host_no); retval->host_queue = NULL; init_waitqueue_head(&retval->host_wait); retval->resetting = 0; @@ -742,11 +738,8 @@ struct Scsi_Host * scsi_register(Scsi_Host_Template * tpnt, int j){ retval->ehandler = NULL; /* Initial value until the thing starts up. */ retval->eh_notify = NULL; /* Who we notify when we exit. */ - /* - * Initialize the fields used for mid-level queueing. - */ - retval->pending_commands = NULL; - retval->host_busy = FALSE; + + retval->host_blocked = FALSE; #ifdef DEBUG printk("Register %x %x: %d\n", (int)retval, (int)retval->hostt, j); @@ -802,6 +795,7 @@ static void launch_error_handler_thread(struct Scsi_Host * shpnt) kernel_thread((int (*)(void *))scsi_error_handler, (void *) shpnt, 0); + /* * Now wait for the kernel error thread to initialize itself * as it might be needed when we scan the bus. @@ -892,7 +886,6 @@ unsigned int __init scsi_init(void) printk ("scsi : %d host%s.\n", next_scsi_host, (next_scsi_host == 1) ? "" : "s"); - scsi_make_blocked_list(); /* Now attach the high level drivers */ #ifdef CONFIG_BLK_DEV_SD |