diff options
Diffstat (limited to 'drivers/scsi/libata.h')
-rw-r--r-- | drivers/scsi/libata.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 6442c2f1a80c..c9ff83bbcfae 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
@@ -32,7 +32,6 @@ | |||
32 | #define DRV_VERSION "1.30" /* must be exactly four chars */ | 32 | #define DRV_VERSION "1.30" /* must be exactly four chars */ |
33 | 33 | ||
34 | struct ata_scsi_args { | 34 | struct ata_scsi_args { |
35 | struct ata_port *ap; | ||
36 | struct ata_device *dev; | 35 | struct ata_device *dev; |
37 | u16 *id; | 36 | u16 *id; |
38 | struct scsi_cmnd *cmd; | 37 | struct scsi_cmnd *cmd; |
@@ -43,18 +42,16 @@ struct ata_scsi_args { | |||
43 | extern int atapi_enabled; | 42 | extern int atapi_enabled; |
44 | extern int atapi_dmadir; | 43 | extern int atapi_dmadir; |
45 | extern int libata_fua; | 44 | extern int libata_fua; |
46 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, | 45 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev); |
47 | struct ata_device *dev); | ||
48 | extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc); | 46 | extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc); |
49 | extern void ata_dev_disable(struct ata_port *ap, struct ata_device *dev); | 47 | extern void ata_dev_disable(struct ata_device *dev); |
50 | extern void ata_port_flush_task(struct ata_port *ap); | 48 | extern void ata_port_flush_task(struct ata_port *ap); |
51 | extern unsigned ata_exec_internal(struct ata_port *ap, struct ata_device *dev, | 49 | extern unsigned ata_exec_internal(struct ata_device *dev, |
52 | struct ata_taskfile *tf, const u8 *cdb, | 50 | struct ata_taskfile *tf, const u8 *cdb, |
53 | int dma_dir, void *buf, unsigned int buflen); | 51 | int dma_dir, void *buf, unsigned int buflen); |
54 | extern int sata_down_spd_limit(struct ata_port *ap); | 52 | extern int sata_down_spd_limit(struct ata_port *ap); |
55 | extern int sata_set_spd_needed(struct ata_port *ap); | 53 | extern int sata_set_spd_needed(struct ata_port *ap); |
56 | extern int ata_down_xfermask_limit(struct ata_port *ap, struct ata_device *dev, | 54 | extern int ata_down_xfermask_limit(struct ata_device *dev, int force_pio0); |
57 | int force_pio0); | ||
58 | extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev); | 55 | extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev); |
59 | extern int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset, | 56 | extern int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset, |
60 | unsigned int *classes); | 57 | unsigned int *classes); |