diff options
Diffstat (limited to 'drivers/ata/sata_promise.c')
-rw-r--r-- | drivers/ata/sata_promise.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index ba9a2570a742..b1fd7d62071a 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -176,7 +176,9 @@ static const struct ata_port_operations pdc_common_ops = { | |||
176 | .check_atapi_dma = pdc_check_atapi_dma, | 176 | .check_atapi_dma = pdc_check_atapi_dma, |
177 | .qc_prep = pdc_qc_prep, | 177 | .qc_prep = pdc_qc_prep, |
178 | .qc_issue = pdc_qc_issue, | 178 | .qc_issue = pdc_qc_issue, |
179 | |||
179 | .sff_irq_clear = pdc_irq_clear, | 180 | .sff_irq_clear = pdc_irq_clear, |
181 | .lost_interrupt = ATA_OP_NULL, | ||
180 | 182 | ||
181 | .post_internal_cmd = pdc_post_internal_cmd, | 183 | .post_internal_cmd = pdc_post_internal_cmd, |
182 | .error_handler = pdc_error_handler, | 184 | .error_handler = pdc_error_handler, |
@@ -213,8 +215,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
213 | { | 215 | { |
214 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 216 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
215 | PDC_FLAG_SATA_PATA, | 217 | PDC_FLAG_SATA_PATA, |
216 | .pio_mask = 0x1f, /* pio0-4 */ | 218 | .pio_mask = ATA_PIO4, |
217 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 219 | .mwdma_mask = ATA_MWDMA2, |
218 | .udma_mask = ATA_UDMA6, | 220 | .udma_mask = ATA_UDMA6, |
219 | .port_ops = &pdc_old_sata_ops, | 221 | .port_ops = &pdc_old_sata_ops, |
220 | }, | 222 | }, |
@@ -222,8 +224,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
222 | [board_2037x_pata] = | 224 | [board_2037x_pata] = |
223 | { | 225 | { |
224 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, | 226 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, |
225 | .pio_mask = 0x1f, /* pio0-4 */ | 227 | .pio_mask = ATA_PIO4, |
226 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 228 | .mwdma_mask = ATA_MWDMA2, |
227 | .udma_mask = ATA_UDMA6, | 229 | .udma_mask = ATA_UDMA6, |
228 | .port_ops = &pdc_pata_ops, | 230 | .port_ops = &pdc_pata_ops, |
229 | }, | 231 | }, |
@@ -232,8 +234,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
232 | { | 234 | { |
233 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 235 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
234 | PDC_FLAG_4_PORTS, | 236 | PDC_FLAG_4_PORTS, |
235 | .pio_mask = 0x1f, /* pio0-4 */ | 237 | .pio_mask = ATA_PIO4, |
236 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 238 | .mwdma_mask = ATA_MWDMA2, |
237 | .udma_mask = ATA_UDMA6, | 239 | .udma_mask = ATA_UDMA6, |
238 | .port_ops = &pdc_old_sata_ops, | 240 | .port_ops = &pdc_old_sata_ops, |
239 | }, | 241 | }, |
@@ -242,8 +244,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
242 | { | 244 | { |
243 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | | 245 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | |
244 | PDC_FLAG_4_PORTS, | 246 | PDC_FLAG_4_PORTS, |
245 | .pio_mask = 0x1f, /* pio0-4 */ | 247 | .pio_mask = ATA_PIO4, |
246 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 248 | .mwdma_mask = ATA_MWDMA2, |
247 | .udma_mask = ATA_UDMA6, | 249 | .udma_mask = ATA_UDMA6, |
248 | .port_ops = &pdc_pata_ops, | 250 | .port_ops = &pdc_pata_ops, |
249 | }, | 251 | }, |
@@ -252,8 +254,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
252 | { | 254 | { |
253 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 255 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
254 | PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA, | 256 | PDC_FLAG_GEN_II | PDC_FLAG_SATA_PATA, |
255 | .pio_mask = 0x1f, /* pio0-4 */ | 257 | .pio_mask = ATA_PIO4, |
256 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 258 | .mwdma_mask = ATA_MWDMA2, |
257 | .udma_mask = ATA_UDMA6, | 259 | .udma_mask = ATA_UDMA6, |
258 | .port_ops = &pdc_sata_ops, | 260 | .port_ops = &pdc_sata_ops, |
259 | }, | 261 | }, |
@@ -262,8 +264,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
262 | { | 264 | { |
263 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | | 265 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS | |
264 | PDC_FLAG_GEN_II, | 266 | PDC_FLAG_GEN_II, |
265 | .pio_mask = 0x1f, /* pio0-4 */ | 267 | .pio_mask = ATA_PIO4, |
266 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 268 | .mwdma_mask = ATA_MWDMA2, |
267 | .udma_mask = ATA_UDMA6, | 269 | .udma_mask = ATA_UDMA6, |
268 | .port_ops = &pdc_pata_ops, | 270 | .port_ops = &pdc_pata_ops, |
269 | }, | 271 | }, |
@@ -272,8 +274,8 @@ static const struct ata_port_info pdc_port_info[] = { | |||
272 | { | 274 | { |
273 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | | 275 | .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA | |
274 | PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS, | 276 | PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS, |
275 | .pio_mask = 0x1f, /* pio0-4 */ | 277 | .pio_mask = ATA_PIO4, |
276 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 278 | .mwdma_mask = ATA_MWDMA2, |
277 | .udma_mask = ATA_UDMA6, | 279 | .udma_mask = ATA_UDMA6, |
278 | .port_ops = &pdc_sata_ops, | 280 | .port_ops = &pdc_sata_ops, |
279 | }, | 281 | }, |