1 files changed, 8 insertions, 45 deletions

diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 5ff6fc1819dc..1a49c777607c 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -531,21 +531,6 @@ static void ioat1_cleanup_event(unsigned long data)
         writew(IOAT_CHANCTRL_RUN, ioat->base.reg_base + IOAT_CHANCTRL_OFFSET);
 }
 
-void ioat_dma_unmap(struct ioat_chan_common *chan, enum dma_ctrl_flags flags,
-                    size_t len, struct ioat_dma_descriptor *hw)
-{
-        struct pci_dev *pdev = chan->device->pdev;
-        size_t offset = len - hw->size;
-
-        if (!(flags & DMA_COMPL_SKIP_DEST_UNMAP))
-                ioat_unmap(pdev, hw->dst_addr - offset, len,
-                           PCI_DMA_FROMDEVICE, flags, 1);
-
-        if (!(flags & DMA_COMPL_SKIP_SRC_UNMAP))
-                ioat_unmap(pdev, hw->src_addr - offset, len,
-                           PCI_DMA_TODEVICE, flags, 0);
-}
-
 dma_addr_t ioat_get_current_completion(struct ioat_chan_common *chan)
 {
         dma_addr_t phys_complete;
@@ -602,7 +587,7 @@ static void __cleanup(struct ioat_dma_chan *ioat, dma_addr_t phys_complete)
                 dump_desc_dbg(ioat, desc);
                 if (tx->cookie) {
                         dma_cookie_complete(tx);
-                        ioat_dma_unmap(chan, tx->flags, desc->len, desc->hw);
+                        dma_descriptor_unmap(tx);
                         ioat->active -= desc->hw->tx_cnt;
                         if (tx->callback) {
                                 tx->callback(tx->callback_param);
@@ -733,7 +718,7 @@ ioat_dma_tx_status(struct dma_chan *c, dma_cookie_t cookie,
         enum dma_status ret;
 
         ret = dma_cookie_status(c, cookie, txstate);
-        if (ret == DMA_SUCCESS)
+        if (ret == DMA_COMPLETE)
                 return ret;
 
         device->cleanup_fn((unsigned long) c);
@@ -833,8 +818,7 @@ int ioat_dma_self_test(struct ioatdma_device *device)
 
         dma_src = dma_map_single(dev, src, IOAT_TEST_SIZE, DMA_TO_DEVICE);
         dma_dest = dma_map_single(dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE);
-        flags = DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP |
-                DMA_PREP_INTERRUPT;
+        flags = DMA_PREP_INTERRUPT;
         tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src,
                                                    IOAT_TEST_SIZE, flags);
         if (!tx) {
@@ -859,7 +843,7 @@ int ioat_dma_self_test(struct ioatdma_device *device)
 
         if (tmo == 0 ||
             dma->device_tx_status(dma_chan, cookie, NULL)
-                                        != DMA_SUCCESS) {
+                                        != DMA_COMPLETE) {
                 dev_err(dev, "Self-test copy timed out, disabling\n");
                 err = -ENODEV;
                 goto unmap_dma;
@@ -885,8 +869,7 @@ static char ioat_interrupt_style[32] = "msix";
 module_param_string(ioat_interrupt_style, ioat_interrupt_style,
                     sizeof(ioat_interrupt_style), 0644);
 MODULE_PARM_DESC(ioat_interrupt_style,
-                 "set ioat interrupt style: msix (default), "
-                 "msix-single-vector, msi, intx)");
+                 "set ioat interrupt style: msix (default), msi, intx");
 
 /**
  * ioat_dma_setup_interrupts - setup interrupt handler
@@ -904,8 +887,6 @@ int ioat_dma_setup_interrupts(struct ioatdma_device *device)
 
         if (!strcmp(ioat_interrupt_style, "msix"))
                 goto msix;
-        if (!strcmp(ioat_interrupt_style, "msix-single-vector"))
-                goto msix_single_vector;
         if (!strcmp(ioat_interrupt_style, "msi"))
                 goto msi;
         if (!strcmp(ioat_interrupt_style, "intx"))
@@ -920,10 +901,8 @@ msix:
                 device->msix_entries[i].entry = i;
 
         err = pci_enable_msix(pdev, device->msix_entries, msixcnt);
-        if (err < 0)
+        if (err)
                 goto msi;
-        if (err > 0)
-                goto msix_single_vector;
 
         for (i = 0; i < msixcnt; i++) {
                 msix = &device->msix_entries[i];
@@ -937,29 +916,13 @@ msix:
                                 chan = ioat_chan_by_index(device, j);
                                 devm_free_irq(dev, msix->vector, chan);
                         }
-                        goto msix_single_vector;
+                        goto msi;
                 }
         }
         intrctrl |= IOAT_INTRCTRL_MSIX_VECTOR_CONTROL;
         device->irq_mode = IOAT_MSIX;
         goto done;
 
-msix_single_vector:
-        msix = &device->msix_entries[0];
-        msix->entry = 0;
-        err = pci_enable_msix(pdev, device->msix_entries, 1);
-        if (err)
-                goto msi;
-
-        err = devm_request_irq(dev, msix->vector, ioat_dma_do_interrupt, 0,
-                               "ioat-msix", device);
-        if (err) {
-                pci_disable_msix(pdev);
-                goto msi;
-        }
-        device->irq_mode = IOAT_MSIX_SINGLE;
-        goto done;
-
 msi:
         err = pci_enable_msi(pdev);
         if (err)
@@ -971,7 +934,7 @@ msi:
                 pci_disable_msi(pdev);
                 goto intx;
         }
-        device->irq_mode = IOAT_MSIX;
+        device->irq_mode = IOAT_MSI;
         goto done;
 
 intx: