udmabuf: separate out creating/destroying scatter-table

[linux.git] / drivers / scsi / ips.c

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index ee8a1ecd58fd85f7544a450191031e8eec387d09..e8bc8d328bab6862c3c1cc70bd121af9543197cd 100644 (file)
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -365,7 +365,6 @@ static struct scsi_host_template ips_driver_template = {
        .this_id                = -1,
        .sg_tablesize           = IPS_MAX_SG,
        .cmd_per_lun            = 3,
-       .use_clustering         = ENABLE_CLUSTERING,
        .no_write_same          = 1,
 };
 
@@ -1801,13 +1800,13 @@ ips_fill_scb_sg_single(ips_ha_t * ha, dma_addr_t busaddr,
        }
        if (IPS_USE_ENH_SGLIST(ha)) {
                scb->sg_list.enh_list[indx].address_lo =
-                   cpu_to_le32(pci_dma_lo32(busaddr));
+                   cpu_to_le32(lower_32_bits(busaddr));
                scb->sg_list.enh_list[indx].address_hi =
-                   cpu_to_le32(pci_dma_hi32(busaddr));
+                   cpu_to_le32(upper_32_bits(busaddr));
                scb->sg_list.enh_list[indx].length = cpu_to_le32(e_len);
        } else {
                scb->sg_list.std_list[indx].address =
-                   cpu_to_le32(pci_dma_lo32(busaddr));
+                   cpu_to_le32(lower_32_bits(busaddr));
                scb->sg_list.std_list[indx].length = cpu_to_le32(e_len);
        }
 
@@ -6678,7 +6677,6 @@ ips_register_scsi(int index)
        sh->sg_tablesize = sh->hostt->sg_tablesize;
        sh->can_queue = sh->hostt->can_queue;
        sh->cmd_per_lun = sh->hostt->cmd_per_lun;
-       sh->use_clustering = sh->hostt->use_clustering;
        sh->max_sectors = 128;
 
        sh->max_id = ha->ntargets;
@@ -6926,7 +6924,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
         * it!  Also, don't use 64bit addressing if dma addresses
         * are guaranteed to be < 4G.
         */
-       if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) &&
+       if (sizeof(dma_addr_t) > 4 && IPS_HAS_ENH_SGLIST(ha) &&
            !dma_set_mask(&ha->pcidev->dev, DMA_BIT_MASK(64))) {
                (ha)->flags |= IPS_HA_ENH_SG;
        } else {