Merge branch 'upstream'

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index 9a8eea11b0be..16db62211716 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -64,7 +64,7 @@
 enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)
 {
         struct Scsi_Host *host = cmd->device->host;
-        struct ata_port *ap = (struct ata_port *) &host->hostdata[0];
+        struct ata_port *ap = ata_shost_to_port(host);
         unsigned long flags;
         struct ata_queued_cmd *qc;
         enum scsi_eh_timer_return ret = EH_HANDLED;
@@ -97,9 +97,9 @@ enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)
  *      RETURNS:
  *      Zero.
  */
-int ata_scsi_error(struct Scsi_Host *host)
+void ata_scsi_error(struct Scsi_Host *host)
 {
-        struct ata_port *ap = (struct ata_port *)&host->hostdata[0];
+        struct ata_port *ap = ata_shost_to_port(host);
 
         DPRINTK("ENTER\n");
 
@@ -116,7 +116,6 @@ int ata_scsi_error(struct Scsi_Host *host)
         scsi_eh_flush_done_q(&ap->eh_done_q);
 
         DPRINTK("EXIT\n");
-        return 0;
 }
 
 /**