thermal: rcar_thermal: Remove temperature bound

[linux-2.6-microblaze.git] / drivers / scsi / mvumi.c

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 1fb6f6c..8906ace 100644 (file)
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -195,23 +195,22 @@ static int mvumi_make_sgl(struct mvumi_hba *mhba, struct scsi_cmnd *scmd,
        unsigned int sgnum = scsi_sg_count(scmd);
        dma_addr_t busaddr;
 
-       sg = scsi_sglist(scmd);
-       *sg_count = dma_map_sg(&mhba->pdev->dev, sg, sgnum,
+       *sg_count = dma_map_sg(&mhba->pdev->dev, scsi_sglist(scmd), sgnum,
                               scmd->sc_data_direction);
        if (*sg_count > mhba->max_sge) {
                dev_err(&mhba->pdev->dev,
                        "sg count[0x%x] is bigger than max sg[0x%x].\n",
                        *sg_count, mhba->max_sge);
-               dma_unmap_sg(&mhba->pdev->dev, sg, sgnum,
+               dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd), sgnum,
                             scmd->sc_data_direction);
                return -1;
        }
-       for (i = 0; i < *sg_count; i++) {
-               busaddr = sg_dma_address(&sg[i]);
+       scsi_for_each_sg(scmd, sg, *sg_count, i) {
+               busaddr = sg_dma_address(sg);
                m_sg->baseaddr_l = cpu_to_le32(lower_32_bits(busaddr));
                m_sg->baseaddr_h = cpu_to_le32(upper_32_bits(busaddr));
                m_sg->flags = 0;
-               sgd_setsz(mhba, m_sg, cpu_to_le32(sg_dma_len(&sg[i])));
+               sgd_setsz(mhba, m_sg, cpu_to_le32(sg_dma_len(sg)));
                if ((i + 1) == *sg_count)
                        m_sg->flags |= 1U << mhba->eot_flag;