From 07335ddc395b240cc6d4ffa19eed4be088b963fb Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 4 Nov 2006 09:55:33 +0100 Subject: [PATCH] --- yaml --- r: 43459 b: refs/heads/master c: 58272c1c0330f5f899f130d45ce845ca085de044 h: refs/heads/master i: 43457: 2aa1c3747bb8849a393fef608171d3775e7ccd1a 43455: 29dc026bca6c1a1eae2b4f3a620ebaf91ad361e5 v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/sbp2.c | 30 +++++++----------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/[refs] b/[refs] index 8c72fb7bd685..187ae7841426 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a533b179dcfe941ccbe30344d14f39f6d7098ae +refs/heads/master: 58272c1c0330f5f899f130d45ce845ca085de044 diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c index 187e26f0485d..5d3b96e0a951 100644 --- a/trunk/drivers/ieee1394/sbp2.c +++ b/trunk/drivers/ieee1394/sbp2.c @@ -591,18 +591,14 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb( 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 *) - 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; + struct hpsb_host *host = lu->ud->ne->host; if (cmd->cmd_dma) { 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->cmd_dma = 0; } - if (cmd->sge_buffer) { pci_unmap_sg(host->pdev, cmd->sge_buffer, cmd->dma_size, cmd->dma_dir); 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); }