diff options
Diffstat (limited to 'drivers/scsi/pcmcia')
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 15 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 2 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/sym53c500_cs.c | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 496c412c8854..3dddb323e718 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -92,9 +92,7 @@ static Scsi_Host_Template nsp_driver_template = { | |||
92 | #endif | 92 | #endif |
93 | .info = nsp_info, | 93 | .info = nsp_info, |
94 | .queuecommand = nsp_queuecommand, | 94 | .queuecommand = nsp_queuecommand, |
95 | /* .eh_strategy_handler = nsp_eh_strategy,*/ | ||
96 | /* .eh_abort_handler = nsp_eh_abort,*/ | 95 | /* .eh_abort_handler = nsp_eh_abort,*/ |
97 | /* .eh_device_reset_handler = nsp_eh_device_reset,*/ | ||
98 | .eh_bus_reset_handler = nsp_eh_bus_reset, | 96 | .eh_bus_reset_handler = nsp_eh_bus_reset, |
99 | .eh_host_reset_handler = nsp_eh_host_reset, | 97 | .eh_host_reset_handler = nsp_eh_host_reset, |
100 | .can_queue = 1, | 98 | .can_queue = 1, |
@@ -1536,11 +1534,6 @@ nsp_proc_info( | |||
1536 | /* error handler */ | 1534 | /* error handler */ |
1537 | /*---------------------------------------------------------------*/ | 1535 | /*---------------------------------------------------------------*/ |
1538 | 1536 | ||
1539 | /*static int nsp_eh_strategy(struct Scsi_Host *Shost) | ||
1540 | { | ||
1541 | return FAILED; | ||
1542 | }*/ | ||
1543 | |||
1544 | /* | 1537 | /* |
1545 | static int nsp_eh_abort(Scsi_Cmnd *SCpnt) | 1538 | static int nsp_eh_abort(Scsi_Cmnd *SCpnt) |
1546 | { | 1539 | { |
@@ -1549,14 +1542,6 @@ static int nsp_eh_abort(Scsi_Cmnd *SCpnt) | |||
1549 | return nsp_eh_bus_reset(SCpnt); | 1542 | return nsp_eh_bus_reset(SCpnt); |
1550 | }*/ | 1543 | }*/ |
1551 | 1544 | ||
1552 | /* | ||
1553 | static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt) | ||
1554 | { | ||
1555 | nsp_dbg(NSP_DEBUG_BUSRESET, "%s: SCpnt=0x%p", SCpnt); | ||
1556 | |||
1557 | return FAILED; | ||
1558 | }*/ | ||
1559 | |||
1560 | static int nsp_bus_reset(nsp_hw_data *data) | 1545 | static int nsp_bus_reset(nsp_hw_data *data) |
1561 | { | 1546 | { |
1562 | unsigned int base = data->BaseAddress; | 1547 | unsigned int base = data->BaseAddress; |
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 4766bcd63692..a0175f5d11cd 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c | |||
@@ -81,8 +81,6 @@ static Scsi_Host_Template qlogicfas_driver_template = { | |||
81 | .queuecommand = qlogicfas408_queuecommand, | 81 | .queuecommand = qlogicfas408_queuecommand, |
82 | .eh_abort_handler = qlogicfas408_abort, | 82 | .eh_abort_handler = qlogicfas408_abort, |
83 | .eh_bus_reset_handler = qlogicfas408_bus_reset, | 83 | .eh_bus_reset_handler = qlogicfas408_bus_reset, |
84 | .eh_device_reset_handler= qlogicfas408_device_reset, | ||
85 | .eh_host_reset_handler = qlogicfas408_host_reset, | ||
86 | .bios_param = qlogicfas408_biosparam, | 84 | .bios_param = qlogicfas408_biosparam, |
87 | .can_queue = 1, | 85 | .can_queue = 1, |
88 | .this_id = -1, | 86 | .this_id = -1, |
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index 8457d0d7748a..1667da9508b4 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
@@ -627,7 +627,9 @@ SYM53C500_host_reset(struct scsi_cmnd *SCpnt) | |||
627 | int port_base = SCpnt->device->host->io_port; | 627 | int port_base = SCpnt->device->host->io_port; |
628 | 628 | ||
629 | DEB(printk("SYM53C500_host_reset called\n")); | 629 | DEB(printk("SYM53C500_host_reset called\n")); |
630 | spin_lock_irq(SCpnt->device->host->host_lock); | ||
630 | SYM53C500_int_host_reset(port_base); | 631 | SYM53C500_int_host_reset(port_base); |
632 | spin_unlock_irq(SCpnt->device->host->host_lock); | ||
631 | 633 | ||
632 | return SUCCESS; | 634 | return SUCCESS; |
633 | } | 635 | } |