Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (67 commits)
  fix drivers/ata/sata_fsl.c double-decl
  [libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()
  pata_legacy: Merge winbond support
  ata_generic: Cenatek support
  pata_winbond: error return
  pata_serverworks: Fix cable types and cosmetics
  pata_mpc52xx: remove un-needed assignment
  libata: fix off-by-one in error categorization
  ahci: factor out AHCI enabling and enable AHCI before reading CAP
  ata_piix: implement SIDPR SCR access
  ata_piix: convert to prepare - activate initialization
  libata: factor out ata_pci_activate_sff_host() from ata_pci_one()
  [libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()
  pata_legacy: resychronize with upstream changes and resubmit
  [libata] pata_legacy: typo fix
  [libata] pata_winbond: update for new ->data_xfer hook
  pata_pcmcia: convert to new data_xfer prototype
  libata annotations and fixes
  libata: use dev_driver_string() instead of "libata" in libata-sff.c
  ata_piix: kill unused constants and flags
  ...

2 files changed, 11 insertions, 12 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 0841df01bc19..aa0df0a4b22a 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5142,6 +5142,7 @@ static void ipr_build_ata_ioadl(struct ipr_cmnd *ipr_cmd,
         struct ipr_ioadl_desc *last_ioadl = NULL;
         int len = qc->nbytes + qc->pad_len;
         struct scatterlist *sg;
+        unsigned int si;
 
         if (len == 0)
                 return;
@@ -5159,7 +5160,7 @@ static void ipr_build_ata_ioadl(struct ipr_cmnd *ipr_cmd,
                         cpu_to_be32(sizeof(struct ipr_ioadl_desc) * ipr_cmd->dma_use_sg);
         }
 
-        ata_for_each_sg(sg, qc) {
+        for_each_sg(qc->sg, sg, qc->n_elem, si) {
                 ioadl->flags_and_data_len = cpu_to_be32(ioadl_flags | sg_dma_len(sg));
                 ioadl->address = cpu_to_be32(sg_dma_address(sg));
 
@@ -5222,12 +5223,12 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
                 regs->flags |= IPR_ATA_FLAG_XFER_TYPE_DMA;
                 break;
 
-        case ATA_PROT_ATAPI:
-        case ATA_PROT_ATAPI_NODATA:
+        case ATAPI_PROT_PIO:
+        case ATAPI_PROT_NODATA:
                 regs->flags |= IPR_ATA_FLAG_PACKET_CMD;
                 break;
 
-        case ATA_PROT_ATAPI_DMA:
+        case ATAPI_PROT_DMA:
                 regs->flags |= IPR_ATA_FLAG_PACKET_CMD;
                 regs->flags |= IPR_ATA_FLAG_XFER_TYPE_DMA;
                 break;
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 0829b55c64d2..827cfb132f21 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -158,8 +158,8 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
         struct Scsi_Host *host = sas_ha->core.shost;
         struct sas_internal *i = to_sas_internal(host->transportt);
         struct scatterlist *sg;
-        unsigned int num = 0;
         unsigned int xfer = 0;
+        unsigned int si;
 
         task = sas_alloc_task(GFP_ATOMIC);
         if (!task)
@@ -176,22 +176,20 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
 
         ata_tf_to_fis(&qc->tf, 1, 0, (u8*)&task->ata_task.fis);
         task->uldd_task = qc;
-        if (is_atapi_taskfile(&qc->tf)) {
+        if (ata_is_atapi(qc->tf.protocol)) {
                 memcpy(task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
                 task->total_xfer_len = qc->nbytes + qc->pad_len;
                 task->num_scatter = qc->pad_len ? qc->n_elem + 1 : qc->n_elem;
         } else {
-                ata_for_each_sg(sg, qc) {
-                        num++;
+                for_each_sg(qc->sg, sg, qc->n_elem, si)
                         xfer += sg->length;
-                }
 
                 task->total_xfer_len = xfer;
-                task->num_scatter = num;
+                task->num_scatter = si;
         }
 
         task->data_dir = qc->dma_dir;
-        task->scatter = qc->__sg;
+        task->scatter = qc->sg;
         task->ata_task.retry_count = 1;
         task->task_state_flags = SAS_TASK_STATE_PENDING;
         qc->lldd_task = task;
@@ -200,7 +198,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
         case ATA_PROT_NCQ:
                 task->ata_task.use_ncq = 1;
                 /* fall through */
-        case ATA_PROT_ATAPI_DMA:
+        case ATAPI_PROT_DMA:
         case ATA_PROT_DMA:
                 task->ata_task.dma_xfer = 1;
                 break;