[libata] Add host lock to struct ata_port

Prepare for changes required to support SATA devices
attached to SAS HBAs. For these devices we don't want to
use host_set at all, since libata will not be the owner
of struct scsi_host.

Signed-off-by: Brian King <brking@us.ibm.com>

(with slight merge modifications made by...)
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/libata-bmdma.c b/drivers/scsi/libata-bmdma.c
index 13fab97c840e..004e1a0d8b71 100644
--- a/drivers/scsi/libata-bmdma.c
+++ b/drivers/scsi/libata-bmdma.c
@@ -715,7 +715,6 @@ void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
                         ata_reset_fn_t softreset, ata_reset_fn_t hardreset,
                         ata_postreset_fn_t postreset)
 {
-        struct ata_host_set *host_set = ap->host_set;
         struct ata_eh_context *ehc = &ap->eh_context;
         struct ata_queued_cmd *qc;
         unsigned long flags;
@@ -726,7 +725,7 @@ void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
                 qc = NULL;
 
         /* reset PIO HSM and stop DMA engine */
-        spin_lock_irqsave(&host_set->lock, flags);
+        spin_lock_irqsave(ap->lock, flags);
 
         ap->hsm_task_state = HSM_ST_IDLE;
 
@@ -755,7 +754,7 @@ void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
         ata_chk_status(ap);
         ap->ops->irq_clear(ap);
 
-        spin_unlock_irqrestore(&host_set->lock, flags);
+        spin_unlock_irqrestore(ap->lock, flags);
 
         if (thaw)
                 ata_eh_thaw_port(ap);