1 files changed, 7 insertions, 6 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 41ea7dbc1755..e828e172ccbf 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -136,6 +136,8 @@ enum {
         ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* hueristic */
         ATA_TMOUT_CDB           = 30 * HZ,
         ATA_TMOUT_CDB_QUICK     = 5 * HZ,
+        ATA_TMOUT_INTERNAL      = 30 * HZ,
+        ATA_TMOUT_INTERNAL_QUICK = 5 * HZ,
 
         /* ATA bus states */
         BUS_UNKNOWN             = 0,
@@ -195,7 +197,7 @@ struct ata_port;
 struct ata_queued_cmd;
 
 /* typedefs */
-typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, unsigned int err_mask);
+typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc);
 
 struct ata_ioports {
         unsigned long           cmd_addr;
@@ -280,9 +282,9 @@ struct ata_queued_cmd {
         /* DO NOT iterate over __sg manually, use ata_for_each_sg() */
         struct scatterlist      *__sg;
 
-        ata_qc_cb_t             complete_fn;
+        unsigned int            err_mask;
 
-        struct completion       *waiting;
+        ata_qc_cb_t             complete_fn;
 
         void                    *private_data;
 };
@@ -331,8 +333,6 @@ struct ata_port {
 
         u8                      ctl;    /* cache of ATA control register */
         u8                      last_ctl;       /* Cache last written value */
-        unsigned int            bus_state;
-        unsigned int            port_state;
         unsigned int            pio_mask;
         unsigned int            mwdma_mask;
         unsigned int            udma_mask;
@@ -478,7 +478,7 @@ extern void ata_bmdma_start (struct ata_queued_cmd *qc);
 extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
 extern u8   ata_bmdma_status(struct ata_port *ap);
 extern void ata_bmdma_irq_clear(struct ata_port *ap);
-extern void ata_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask);
+extern void ata_qc_complete(struct ata_queued_cmd *qc);
 extern void ata_eng_timeout(struct ata_port *ap);
 extern void ata_scsi_simulate(u16 *id, struct scsi_cmnd *cmd,
                               void (*done)(struct scsi_cmnd *));
@@ -670,6 +670,7 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
         qc->cursect = qc->cursg = qc->cursg_ofs = 0;
         qc->nsect = 0;
         qc->nbytes = qc->curbytes = 0;
+        qc->err_mask = 0;
 
         ata_tf_init(qc->ap, &qc->tf, qc->dev->devno);
 }