diff options
Diffstat (limited to 'drivers/scsi/sata_sis.c')
-rw-r--r-- | drivers/scsi/sata_sis.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index 728530df2e07..809d337ed641 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <linux/libata.h> | 43 | #include <linux/libata.h> |
44 | 44 | ||
45 | #define DRV_NAME "sata_sis" | 45 | #define DRV_NAME "sata_sis" |
46 | #define DRV_VERSION "0.5" | 46 | #define DRV_VERSION "0.6" |
47 | 47 | ||
48 | enum { | 48 | enum { |
49 | sis_180 = 0, | 49 | sis_180 = 0, |
@@ -96,6 +96,7 @@ static struct scsi_host_template sis_sht = { | |||
96 | .proc_name = DRV_NAME, | 96 | .proc_name = DRV_NAME, |
97 | .dma_boundary = ATA_DMA_BOUNDARY, | 97 | .dma_boundary = ATA_DMA_BOUNDARY, |
98 | .slave_configure = ata_scsi_slave_config, | 98 | .slave_configure = ata_scsi_slave_config, |
99 | .slave_destroy = ata_scsi_slave_destroy, | ||
99 | .bios_param = ata_std_bios_param, | 100 | .bios_param = ata_std_bios_param, |
100 | }; | 101 | }; |
101 | 102 | ||
@@ -106,14 +107,17 @@ static const struct ata_port_operations sis_ops = { | |||
106 | .check_status = ata_check_status, | 107 | .check_status = ata_check_status, |
107 | .exec_command = ata_exec_command, | 108 | .exec_command = ata_exec_command, |
108 | .dev_select = ata_std_dev_select, | 109 | .dev_select = ata_std_dev_select, |
109 | .phy_reset = sata_phy_reset, | ||
110 | .bmdma_setup = ata_bmdma_setup, | 110 | .bmdma_setup = ata_bmdma_setup, |
111 | .bmdma_start = ata_bmdma_start, | 111 | .bmdma_start = ata_bmdma_start, |
112 | .bmdma_stop = ata_bmdma_stop, | 112 | .bmdma_stop = ata_bmdma_stop, |
113 | .bmdma_status = ata_bmdma_status, | 113 | .bmdma_status = ata_bmdma_status, |
114 | .qc_prep = ata_qc_prep, | 114 | .qc_prep = ata_qc_prep, |
115 | .qc_issue = ata_qc_issue_prot, | 115 | .qc_issue = ata_qc_issue_prot, |
116 | .eng_timeout = ata_eng_timeout, | 116 | .data_xfer = ata_pio_data_xfer, |
117 | .freeze = ata_bmdma_freeze, | ||
118 | .thaw = ata_bmdma_thaw, | ||
119 | .error_handler = ata_bmdma_error_handler, | ||
120 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
117 | .irq_handler = ata_interrupt, | 121 | .irq_handler = ata_interrupt, |
118 | .irq_clear = ata_bmdma_irq_clear, | 122 | .irq_clear = ata_bmdma_irq_clear, |
119 | .scr_read = sis_scr_read, | 123 | .scr_read = sis_scr_read, |
@@ -125,8 +129,7 @@ static const struct ata_port_operations sis_ops = { | |||
125 | 129 | ||
126 | static struct ata_port_info sis_port_info = { | 130 | static struct ata_port_info sis_port_info = { |
127 | .sht = &sis_sht, | 131 | .sht = &sis_sht, |
128 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET | | 132 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
129 | ATA_FLAG_NO_LEGACY, | ||
130 | .pio_mask = 0x1f, | 133 | .pio_mask = 0x1f, |
131 | .mwdma_mask = 0x7, | 134 | .mwdma_mask = 0x7, |
132 | .udma_mask = 0x7f, | 135 | .udma_mask = 0x7f, |