iommu sg merging: aacraid: use pci_set_dma_max_seg_size

This sets the segment size limit properly via pci_set_dma_max_seg_size
and remove blk_queue_max_segment_size because scsi-ml calls it.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Acked-by: "Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 0e8267c1e915..fb0886140dd7 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -449,9 +449,6 @@ static int aac_slave_configure(struct scsi_device *sdev)
                 else if (depth < 2)
                         depth = 2;
                 scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth);
-                if (!(((struct aac_dev *)host->hostdata)->adapter_info.options &
-                                AAC_OPT_NEW_COMM))
-                        blk_queue_max_segment_size(sdev->request_queue, 65536);
         } else
                 scsi_adjust_queue_depth(sdev, 0, 1);
 
@@ -1133,6 +1130,12 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         if (error < 0)
                 goto out_deinit;
 
+        if (!(aac->adapter_info.options & AAC_OPT_NEW_COMM)) {
+                error = pci_set_dma_max_seg_size(pdev, 65536);
+                if (error)
+                        goto out_deinit;
+        }
+
         /*
          * Lets override negotiations and drop the maximum SG limit to 34
          */