[SCSI] aacraid: optimize sg alloc

Mark Haverkamp · James Bottomley · commit 3c1e0cca9469 · 2006-05-20T09:21:57.000-05:00
Received From Mark Salyzyn

Slight space and speed efficiency improvement.

Signed-off-by: Mark Haverkamp &lt;markh@osdl.org&gt;
Signed-off-by: James Bottomley &lt;James.Bottomley@SteelEye.com&gt;
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
@@ -2218,15 +2218,15 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg)
 		}
 	}
 	else if(scsicmd->request_bufflen) {
-		dma_addr_t addr; 
-		addr = pci_map_single(dev->pdev,
+		u32 addr;
+		scsicmd->SCp.dma_handle = pci_map_single(dev->pdev,
 				scsicmd->request_buffer,
 				scsicmd->request_bufflen,
 				scsicmd->sc_data_direction);
+		addr = scsicmd->SCp.dma_handle;
 		psg->count = cpu_to_le32(1);
 		psg->sg[0].addr = cpu_to_le32(addr);
 		psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen);  
-		scsicmd->SCp.dma_handle = addr;
 		byte_count = scsicmd->request_bufflen;
 	}
 	return byte_count;

Original file line number	Diff line number	Diff line change
`@@ -2218,15 +2218,15 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg)`
`2218`	`2218`	`}`
`2219`	`2219`	`}`
`2220`	`2220`	`else if(scsicmd->request_bufflen) {`
`2221`		`- dma_addr_t addr;`
`2222`		`- addr = pci_map_single(dev->pdev,`
	`2221`	`+ u32 addr;`
	`2222`	`+ scsicmd->SCp.dma_handle = pci_map_single(dev->pdev,`
`2223`	`2223`	`scsicmd->request_buffer,`
`2224`	`2224`	`scsicmd->request_bufflen,`
`2225`	`2225`	`scsicmd->sc_data_direction);`
	`2226`	`+ addr = scsicmd->SCp.dma_handle;`
`2226`	`2227`	`psg->count = cpu_to_le32(1);`
`2227`	`2228`	`psg->sg[0].addr = cpu_to_le32(addr);`
`2228`	`2229`	`psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen);`
`2229`		`- scsicmd->SCp.dma_handle = addr;`
`2230`	`2230`	`byte_count = scsicmd->request_bufflen;`
`2231`	`2231`	`}`
`2232`	`2232`	`return byte_count;`