diff options
Diffstat (limited to 'drivers/scsi/sata_uli.c')
-rw-r--r-- | drivers/scsi/sata_uli.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index 38b52bd3fa3f..f668c997e9af 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <linux/libata.h> | 37 | #include <linux/libata.h> |
38 | 38 | ||
39 | #define DRV_NAME "sata_uli" | 39 | #define DRV_NAME "sata_uli" |
40 | #define DRV_VERSION "0.5" | 40 | #define DRV_VERSION "0.6" |
41 | 41 | ||
42 | enum { | 42 | enum { |
43 | uli_5289 = 0, | 43 | uli_5289 = 0, |
@@ -90,6 +90,7 @@ static struct scsi_host_template uli_sht = { | |||
90 | .proc_name = DRV_NAME, | 90 | .proc_name = DRV_NAME, |
91 | .dma_boundary = ATA_DMA_BOUNDARY, | 91 | .dma_boundary = ATA_DMA_BOUNDARY, |
92 | .slave_configure = ata_scsi_slave_config, | 92 | .slave_configure = ata_scsi_slave_config, |
93 | .slave_destroy = ata_scsi_slave_destroy, | ||
93 | .bios_param = ata_std_bios_param, | 94 | .bios_param = ata_std_bios_param, |
94 | }; | 95 | }; |
95 | 96 | ||
@@ -102,16 +103,18 @@ static const struct ata_port_operations uli_ops = { | |||
102 | .exec_command = ata_exec_command, | 103 | .exec_command = ata_exec_command, |
103 | .dev_select = ata_std_dev_select, | 104 | .dev_select = ata_std_dev_select, |
104 | 105 | ||
105 | .phy_reset = sata_phy_reset, | ||
106 | |||
107 | .bmdma_setup = ata_bmdma_setup, | 106 | .bmdma_setup = ata_bmdma_setup, |
108 | .bmdma_start = ata_bmdma_start, | 107 | .bmdma_start = ata_bmdma_start, |
109 | .bmdma_stop = ata_bmdma_stop, | 108 | .bmdma_stop = ata_bmdma_stop, |
110 | .bmdma_status = ata_bmdma_status, | 109 | .bmdma_status = ata_bmdma_status, |
111 | .qc_prep = ata_qc_prep, | 110 | .qc_prep = ata_qc_prep, |
112 | .qc_issue = ata_qc_issue_prot, | 111 | .qc_issue = ata_qc_issue_prot, |
112 | .data_xfer = ata_pio_data_xfer, | ||
113 | 113 | ||
114 | .eng_timeout = ata_eng_timeout, | 114 | .freeze = ata_bmdma_freeze, |
115 | .thaw = ata_bmdma_thaw, | ||
116 | .error_handler = ata_bmdma_error_handler, | ||
117 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
115 | 118 | ||
116 | .irq_handler = ata_interrupt, | 119 | .irq_handler = ata_interrupt, |
117 | .irq_clear = ata_bmdma_irq_clear, | 120 | .irq_clear = ata_bmdma_irq_clear, |
@@ -126,8 +129,7 @@ static const struct ata_port_operations uli_ops = { | |||
126 | 129 | ||
127 | static struct ata_port_info uli_port_info = { | 130 | static struct ata_port_info uli_port_info = { |
128 | .sht = &uli_sht, | 131 | .sht = &uli_sht, |
129 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET | | 132 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
130 | ATA_FLAG_NO_LEGACY, | ||
131 | .pio_mask = 0x1f, /* pio0-4 */ | 133 | .pio_mask = 0x1f, /* pio0-4 */ |
132 | .udma_mask = 0x7f, /* udma0-6 */ | 134 | .udma_mask = 0x7f, /* udma0-6 */ |
133 | .port_ops = &uli_ops, | 135 | .port_ops = &uli_ops, |