lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieee1394: sbp2: wrap two functions into one

Browse Source 
Move the body of a function into its only caller.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter
2006-11-04 09:55:33 +01:00
parent 2a533b179d
commit 58272c1c03
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/ieee1394/sbp2.c
View File

@@ -591,18 +591,14 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(
return cmd; return cmd;
} }
static void sbp2util_free_command_dma(struct sbp2_command_info *cmd) /*
* Unmaps the DMAs of a command and moves the command to the completed ORB list.
* Must be called with lu->cmd_orb_lock held.
*/
static void sbp2util_mark_command_completed(struct sbp2_lu *lu,
struct sbp2_command_info *cmd)
{ {
struct sbp2_lu *lu = (struct sbp2_lu *) struct hpsb_host *host = lu->ud->ne->host;
cmd->Current_SCpnt->device->host->hostdata[0];
struct hpsb_host *host;
if (!lu) {
SBP2_ERR("%s: lu == NULL", __FUNCTION__);
return;
}
host = lu->ud->ne->host;
if (cmd->cmd_dma) { if (cmd->cmd_dma) {
if (cmd->dma_type == CMD_DMA_SINGLE) if (cmd->dma_type == CMD_DMA_SINGLE)
@@ -615,23 +611,11 @@ static void sbp2util_free_command_dma(struct sbp2_command_info *cmd)
cmd->dma_type = CMD_DMA_NONE; cmd->dma_type = CMD_DMA_NONE;
cmd->cmd_dma = 0; cmd->cmd_dma = 0;
} }
if (cmd->sge_buffer) { if (cmd->sge_buffer) {
pci_unmap_sg(host->pdev, cmd->sge_buffer, pci_unmap_sg(host->pdev, cmd->sge_buffer,
cmd->dma_size, cmd->dma_dir); cmd->dma_size, cmd->dma_dir);
cmd->sge_buffer = NULL; cmd->sge_buffer = NULL;
} }
}
/*
* This function moves a command to the completed orb list.
* Must be called with lu->cmd_orb_lock held.
*/
static void sbp2util_mark_command_completed(
struct sbp2_lu *lu,
struct sbp2_command_info *cmd)
{
sbp2util_free_command_dma(cmd);
list_move_tail(&cmd->list, &lu->cmd_orb_completed); list_move_tail(&cmd->list, &lu->cmd_orb_completed);
} }