From ca55c348a5112031493e96160bee3ec6f9e780dc Mon Sep 17 00:00:00 2001 From: Dave Jiang Date: Tue, 26 Feb 2013 09:20:36 -0700 Subject: [PATCH] --- yaml --- r: 374620 b: refs/heads/master c: 9a37f644046c2f5b7889be642487e6f9dd58c5d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/ioat/dma_v3.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 55baf0e338d7..34ea9c9d58da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50f9f97e70fa4679fa197cb6dea358329298b987 +refs/heads/master: 9a37f644046c2f5b7889be642487e6f9dd58c5d7 diff --git a/trunk/drivers/dma/ioat/dma_v3.c b/trunk/drivers/dma/ioat/dma_v3.c index dc8dcfb7a8a6..a1dcfb2670f7 100644 --- a/trunk/drivers/dma/ioat/dma_v3.c +++ b/trunk/drivers/dma/ioat/dma_v3.c @@ -1331,15 +1331,9 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca) } - if (is_raid_device) { - dma->device_tx_status = ioat3_tx_status; - device->cleanup_fn = ioat3_cleanup_event; - device->timer_fn = ioat3_timer_event; - } else { - dma->device_tx_status = ioat_dma_tx_status; - device->cleanup_fn = ioat2_cleanup_event; - device->timer_fn = ioat2_timer_event; - } + dma->device_tx_status = ioat3_tx_status; + device->cleanup_fn = ioat3_cleanup_event; + device->timer_fn = ioat3_timer_event; #ifdef CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA dma_cap_clear(DMA_PQ_VAL, dma->cap_mask);