1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 45fbeed1c1a5..528c62dd4b00 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -169,6 +169,7 @@ typedef void (*dma_isr_handler)(struct tegra_dma_channel *tdc,
 /* tegra_dma_channel: Channel specific information */
 struct tegra_dma_channel {
         struct dma_chan         dma_chan;
+        char                    name[30];
         bool                    config_init;
         int                     id;
         int                     irq;
@@ -475,8 +476,7 @@ static void tegra_dma_abort_all(struct tegra_dma_channel *tdc)
         while (!list_empty(&tdc->pending_sg_req)) {
                 sgreq = list_first_entry(&tdc->pending_sg_req,
                                                 typeof(*sgreq), node);
-                list_del(&sgreq->node);
-                list_add_tail(&sgreq->node, &tdc->free_sg_req);
+                list_move_tail(&sgreq->node, &tdc->free_sg_req);
                 if (sgreq->last_sg) {
                         dma_desc = sgreq->dma_desc;
                         dma_desc->dma_status = DMA_ERROR;
@@ -570,8 +570,7 @@ static void handle_cont_sngl_cycle_dma_done(struct tegra_dma_channel *tdc,
 
         /* If not last req then put at end of pending list */
         if (!list_is_last(&sgreq->node, &tdc->pending_sg_req)) {
-                list_del(&sgreq->node);
-                list_add_tail(&sgreq->node, &tdc->pending_sg_req);
+                list_move_tail(&sgreq->node, &tdc->pending_sg_req);
                 sgreq->configured = false;
                 st = handle_continuous_head_request(tdc, sgreq, to_terminate);
                 if (!st)
@@ -1284,7 +1283,6 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev)
         INIT_LIST_HEAD(&tdma->dma_dev.channels);
         for (i = 0; i < cdata->nr_channels; i++) {
                 struct tegra_dma_channel *tdc = &tdma->channels[i];
-                char irq_name[30];
 
                 tdc->chan_base_offset = TEGRA_APBDMA_CHANNEL_BASE_ADD_OFFSET +
                                         i * TEGRA_APBDMA_CHANNEL_REGISTER_SIZE;
@@ -1296,9 +1294,9 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev)
                         goto err_irq;
                 }
                 tdc->irq = res->start;
-                snprintf(irq_name, sizeof(irq_name), "apbdma.%d", i);
+                snprintf(tdc->name, sizeof(tdc->name), "apbdma.%d", i);
                 ret = devm_request_irq(&pdev->dev, tdc->irq,
-                                tegra_dma_isr, 0, irq_name, tdc);
+                                tegra_dma_isr, 0, tdc->name, tdc);
                 if (ret) {
                         dev_err(&pdev->dev,
                                 "request_irq failed with err %d channel %d\n",