The patch titled ieee1394: ohci1394.c: function calls without effect has been removed from the -mm tree. Its filename is ieee1394-ohci1394c-function-calls-without.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: ieee1394: ohci1394.c: function calls without effect From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> ohci1394: Remove superfluous call to free_dma_rcv_ctx, spotted by Adrian Bunk. Also remove some superfluous comments. Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx> Cc: Ben Collins <bcollins@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ieee1394/ohci1394.c | 11 ----------- 1 files changed, 11 deletions(-) diff -puN drivers/ieee1394/ohci1394.c~ieee1394-ohci1394c-function-calls-without drivers/ieee1394/ohci1394.c --- 25/drivers/ieee1394/ohci1394.c~ieee1394-ohci1394c-function-calls-without Fri Jun 2 14:43:41 2006 +++ 25-akpm/drivers/ieee1394/ohci1394.c Fri Jun 2 14:43:41 2006 @@ -3462,24 +3462,13 @@ static void ohci1394_pci_remove(struct p case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE: /* The ohci_soft_reset() stops all DMA contexts, so we * dont need to do this. */ - /* Free AR dma */ free_dma_rcv_ctx(&ohci->ar_req_context); free_dma_rcv_ctx(&ohci->ar_resp_context); - - /* Free AT dma */ free_dma_trm_ctx(&ohci->at_req_context); free_dma_trm_ctx(&ohci->at_resp_context); - - /* Free IR dma */ free_dma_rcv_ctx(&ohci->ir_legacy_context); - - /* Free IT dma */ free_dma_trm_ctx(&ohci->it_legacy_context); - /* Free IR legacy dma */ - free_dma_rcv_ctx(&ohci->ir_legacy_context); - - case OHCI_INIT_HAVE_SELFID_BUFFER: pci_free_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE, ohci->selfid_buf_cpu, _ Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are git-ieee1394.patch lock-validator-annotate-ieee1394-skb-head-locking.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html