aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/seagate.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/seagate.c')
-rw-r--r--drivers/scsi/seagate.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 4c95abb54057..a0cace9aeb79 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -97,6 +97,7 @@
97#include <linux/delay.h> 97#include <linux/delay.h>
98#include <linux/blkdev.h> 98#include <linux/blkdev.h>
99#include <linux/stat.h> 99#include <linux/stat.h>
100#include <linux/delay.h>
100 101
101#include <asm/io.h> 102#include <asm/io.h>
102#include <asm/system.h> 103#include <asm/system.h>
@@ -1631,7 +1632,7 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd * SCpnt)
1631 /* assert RESET signal on SCSI bus. */ 1632 /* assert RESET signal on SCSI bus. */
1632 WRITE_CONTROL (BASE_CMD | CMD_RST); 1633 WRITE_CONTROL (BASE_CMD | CMD_RST);
1633 1634
1634 udelay (20 * 1000); 1635 mdelay (20);
1635 1636
1636 WRITE_CONTROL (BASE_CMD); 1637 WRITE_CONTROL (BASE_CMD);
1637 st0x_aborted = DID_RESET; 1638 st0x_aborted = DID_RESET;
@@ -1640,16 +1641,6 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd * SCpnt)
1640 return SUCCESS; 1641 return SUCCESS;
1641} 1642}
1642 1643
1643static int seagate_st0x_host_reset(Scsi_Cmnd *SCpnt)
1644{
1645 return FAILED;
1646}
1647
1648static int seagate_st0x_device_reset(Scsi_Cmnd *SCpnt)
1649{
1650 return FAILED;
1651}
1652
1653static int seagate_st0x_release(struct Scsi_Host *shost) 1644static int seagate_st0x_release(struct Scsi_Host *shost)
1654{ 1645{
1655 if (shost->irq) 1646 if (shost->irq)
@@ -1665,8 +1656,6 @@ static Scsi_Host_Template driver_template = {
1665 .queuecommand = seagate_st0x_queue_command, 1656 .queuecommand = seagate_st0x_queue_command,
1666 .eh_abort_handler = seagate_st0x_abort, 1657 .eh_abort_handler = seagate_st0x_abort,
1667 .eh_bus_reset_handler = seagate_st0x_bus_reset, 1658 .eh_bus_reset_handler = seagate_st0x_bus_reset,
1668 .eh_host_reset_handler = seagate_st0x_host_reset,
1669 .eh_device_reset_handler = seagate_st0x_device_reset,
1670 .can_queue = 1, 1659 .can_queue = 1,
1671 .this_id = 7, 1660 .this_id = 7,
1672 .sg_tablesize = SG_ALL, 1661 .sg_tablesize = SG_ALL,