Merge tag 'dmaengine-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / drivers / dma / fsl-dpaa2-qdma / dpaa2-qdma.c

diff --git a/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c b/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
index 4ae0579..8dd40d0 100644 (file)
--- a/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
+++ b/drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
@@ -291,9 +291,8 @@ static void dpaa2_qdma_issue_pending(struct dma_chan *chan)
 
                err = dpaa2_io_service_enqueue_fq(NULL, dpaa2_chan->fqid, fd);
                if (err) {
-                       list_del(&dpaa2_comp->list);
-                       list_add_tail(&dpaa2_comp->list,
-                                     &dpaa2_chan->comp_free);
+                       list_move_tail(&dpaa2_comp->list,
+                                      &dpaa2_chan->comp_free);
                }
        }
 err_enqueue:
@@ -626,8 +625,7 @@ static void dpaa2_qdma_free_desc(struct virt_dma_desc *vdesc)
        dpaa2_comp = to_fsl_qdma_comp(vdesc);
        qchan = dpaa2_comp->qchan;
        spin_lock_irqsave(&qchan->queue_lock, flags);
-       list_del(&dpaa2_comp->list);
-       list_add_tail(&dpaa2_comp->list, &qchan->comp_free);
+       list_move_tail(&dpaa2_comp->list, &qchan->comp_free);
        spin_unlock_irqrestore(&qchan->queue_lock, flags);
 }
 
@@ -703,7 +701,7 @@ static int dpaa2_qdma_probe(struct fsl_mc_device *dpdmai_dev)
        /* DPDMAI enable */
        err = dpdmai_enable(priv->mc_io, 0, dpdmai_dev->mc_handle);
        if (err) {
-               dev_err(dev, "dpdmai_enable() faile\n");
+               dev_err(dev, "dpdmai_enable() failed\n");
                goto err_enable;
        }