This patch converts DAC960 to use blk_end_request(). Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx> Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx> --- drivers/block/DAC960.c | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) Index: 2.6.24-rc3-mm2/drivers/block/DAC960.c =================================================================== --- 2.6.24-rc3-mm2.orig/drivers/block/DAC960.c +++ 2.6.24-rc3-mm2/drivers/block/DAC960.c @@ -3464,10 +3464,7 @@ static inline bool DAC960_ProcessComplet pci_unmap_sg(Command->Controller->PCIDevice, Command->cmd_sglist, Command->SegmentCount, Command->DmaDirection); - if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) { - add_disk_randomness(Request->rq_disk); - end_that_request_last(Request, UpToDate); - + if (!__blk_end_request(Request, UpToDate, Command->BlockCount << 9)) { if (Command->Completion) { complete(Command->Completion); Command->Completion = NULL; - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html