Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

hpsa: move SG descriptor set-up out of hpsa_scatter_gather()

Browse Source 
Move the code which sets up the SG descriptor out of hpsa_scatter_gather()
and into a subroutine where it can be reused (in the next patch).  The Ext
field is now assigned unconditionally: this makes the refactor much simpler,
but more importantly it removes a conditional operation from inside the
loop.  The case for which the conditional formerly tested is now executed
(unconditionally) after the loop is exited.

Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Signed-off-by: Webb Scales <webbnh@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Webb Scales 2015-01-23 16:44:45 -06:00 committed by James Bottomley
parent c05e8866a1
commit ec5cbf0422
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/scsi/hpsa.c
View File

@ -3236,6 +3236,17 @@ out:
kfree(id_phys); kfree(id_phys);
} }
static void hpsa_set_sg_descriptor(struct SGDescriptor *desc,
struct scatterlist *sg)
{
u64 addr64 = (u64) sg_dma_address(sg);
unsigned int len = sg_dma_len(sg);
desc->Addr = cpu_to_le64(addr64);
desc->Len = cpu_to_le32(len);
desc->Ext = 0;
}
/* /*
* hpsa_scatter_gather takes a struct scsi_cmnd, (cmd), and does the pci * hpsa_scatter_gather takes a struct scsi_cmnd, (cmd), and does the pci
* dma mapping and fills in the scatter gather entries of the * dma mapping and fills in the scatter gather entries of the
@ -3245,9 +3256,7 @@ static int hpsa_scatter_gather(struct ctlr_info *h,
struct CommandList *cp, struct CommandList *cp,
struct scsi_cmnd *cmd) struct scsi_cmnd *cmd)
{ {
unsigned int len;
struct scatterlist *sg; struct scatterlist *sg;
u64 addr64;
int use_sg, i, sg_index, chained; int use_sg, i, sg_index, chained;
struct SGDescriptor *curr_sg; struct SGDescriptor *curr_sg;
@ -3270,13 +3279,11 @@ static int hpsa_scatter_gather(struct ctlr_info *h,
curr_sg = h->cmd_sg_list[cp->cmdindex]; curr_sg = h->cmd_sg_list[cp->cmdindex];
sg_index = 0; sg_index = 0;
} }
addr64 = (u64) sg_dma_address(sg); hpsa_set_sg_descriptor(curr_sg, sg);
len = sg_dma_len(sg);
curr_sg->Addr = cpu_to_le64(addr64);
curr_sg->Len = cpu_to_le32(len);
curr_sg->Ext = cpu_to_le32(0);
curr_sg++; curr_sg++;
} }
/* Back the pointer up to the last entry and mark it as "last". */
(--curr_sg)->Ext = cpu_to_le32(HPSA_SG_LAST); (--curr_sg)->Ext = cpu_to_le32(HPSA_SG_LAST);
if (use_sg + chained > h->maxSG) if (use_sg + chained > h->maxSG)