diff options
Diffstat (limited to 'drivers/ata/pata_acpi.c')
-rw-r--r-- | drivers/ata/pata_acpi.c | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index 187545c0898a..35ad488db6ed 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c | |||
@@ -235,39 +235,14 @@ static struct scsi_host_template pacpi_sht = { | |||
235 | ATA_BMDMA_SHT(DRV_NAME), | 235 | ATA_BMDMA_SHT(DRV_NAME), |
236 | }; | 236 | }; |
237 | 237 | ||
238 | static const struct ata_port_operations pacpi_ops = { | 238 | static struct ata_port_operations pacpi_ops = { |
239 | .inherits = &ata_bmdma_port_ops, | ||
240 | .qc_issue = pacpi_qc_issue_prot, | ||
241 | .cable_detect = pacpi_cable_detect, | ||
242 | .mode_filter = pacpi_mode_filter, | ||
239 | .set_piomode = pacpi_set_piomode, | 243 | .set_piomode = pacpi_set_piomode, |
240 | .set_dmamode = pacpi_set_dmamode, | 244 | .set_dmamode = pacpi_set_dmamode, |
241 | .mode_filter = pacpi_mode_filter, | ||
242 | |||
243 | /* Task file is PCI ATA format, use helpers */ | ||
244 | .tf_load = ata_tf_load, | ||
245 | .tf_read = ata_tf_read, | ||
246 | .check_status = ata_check_status, | ||
247 | .exec_command = ata_exec_command, | ||
248 | .dev_select = ata_std_dev_select, | ||
249 | |||
250 | .freeze = ata_bmdma_freeze, | ||
251 | .thaw = ata_bmdma_thaw, | ||
252 | .error_handler = pacpi_error_handler, | 245 | .error_handler = pacpi_error_handler, |
253 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | ||
254 | .cable_detect = pacpi_cable_detect, | ||
255 | |||
256 | /* BMDMA handling is PCI ATA format, use helpers */ | ||
257 | .bmdma_setup = ata_bmdma_setup, | ||
258 | .bmdma_start = ata_bmdma_start, | ||
259 | .bmdma_stop = ata_bmdma_stop, | ||
260 | .bmdma_status = ata_bmdma_status, | ||
261 | .qc_prep = ata_qc_prep, | ||
262 | .qc_issue = pacpi_qc_issue_prot, | ||
263 | .data_xfer = ata_data_xfer, | ||
264 | |||
265 | /* Timeout handling */ | ||
266 | .irq_handler = ata_interrupt, | ||
267 | .irq_clear = ata_bmdma_irq_clear, | ||
268 | .irq_on = ata_irq_on, | ||
269 | |||
270 | /* Generic PATA PCI ATA helpers */ | ||
271 | .port_start = pacpi_port_start, | 246 | .port_start = pacpi_port_start, |
272 | }; | 247 | }; |
273 | 248 | ||