Skip to contentSkip to conversation

sata_inic162x: use dma_max_segment_size in scsi_host_template

PATCH In review FUJITA Tomonori 1 participant 1 message Sep 26, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/5 sata_inic162x: use dma_max_segment_size in scsi_host_template

This removes blk_queue_max_segment_size and uses dma_max_segment_size in scsi_host_template.

---
 drivers/ata/sata_inic162x.c |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)
drivers/ata/sata_inic162x.c +7 -12
index fdbed8e..ae3590f 100644
@@ -108,17 +108,11 @@ struct inic_port_priv {
 	u8	cached_pirq_mask;
 };
 
-static int inic_slave_config(struct scsi_device *sdev)
-{
-	/* This controller is braindamaged.  dma_boundary is 0xffff
-	 * like others but it will lock up the whole machine HARD if
-	 * 65536 byte PRD entry is fed.  Reduce maximum segment size.
-	 */
-	blk_queue_max_segment_size(sdev->request_queue, 65536 - 512);
-
-	return ata_scsi_slave_config(sdev);
-}
-
+/*
+ * This controller is braindamaged.  dma_boundary is 0xffff
+ * like others but it will lock up the whole machine HARD if
+ * 65536 byte PRD entry is fed. Reduce maximum segment size.
+ */
 static struct scsi_host_template inic_sht = {
 	.module			= THIS_MODULE,
 	.name			= DRV_NAME,
@@ -132,7 +126,8 @@ static struct scsi_host_template inic_sht = {
 	.use_clustering		= ATA_SHT_USE_CLUSTERING,
 	.proc_name		= DRV_NAME,
 	.dma_boundary		= ATA_DMA_BOUNDARY,
-	.slave_configure	= inic_slave_config,
+	.dma_max_segment_size	= 65536 - 512,
+	.slave_configure	= ata_scsi_slave_config,
 	.slave_destroy		= ata_scsi_slave_destroy,
 	.bios_param		= ata_std_bios_param,
 };
Signature · 1 line
1.5.2.4