Merge tag 'ntb-4.20' of git://github.com/jonmason/ntb

[linux.git] / drivers / dma / stm32-mdma.c

diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c
index 9dc450b7ace6c1c6291064dc6d37255860d74a14..390e4cae0e1a5519a12fb4ba47401633a5c42b3a 100644 (file)
--- a/drivers/dma/stm32-mdma.c
+++ b/drivers/dma/stm32-mdma.c
@@ -1170,7 +1170,7 @@ static void stm32_mdma_start_transfer(struct stm32_mdma_chan *chan)
 
        chan->busy = true;
 
-       dev_dbg(chan2dev(chan), "vchan %p: started\n", &chan->vchan);
+       dev_dbg(chan2dev(chan), "vchan %pK: started\n", &chan->vchan);
 }
 
 static void stm32_mdma_issue_pending(struct dma_chan *c)
@@ -1183,7 +1183,7 @@ static void stm32_mdma_issue_pending(struct dma_chan *c)
        if (!vchan_issue_pending(&chan->vchan))
                goto end;
 
-       dev_dbg(chan2dev(chan), "vchan %p: issued\n", &chan->vchan);
+       dev_dbg(chan2dev(chan), "vchan %pK: issued\n", &chan->vchan);
 
        if (!chan->desc && !chan->busy)
                stm32_mdma_start_transfer(chan);
@@ -1203,7 +1203,7 @@ static int stm32_mdma_pause(struct dma_chan *c)
        spin_unlock_irqrestore(&chan->vchan.lock, flags);
 
        if (!ret)
-               dev_dbg(chan2dev(chan), "vchan %p: pause\n", &chan->vchan);
+               dev_dbg(chan2dev(chan), "vchan %pK: pause\n", &chan->vchan);
 
        return ret;
 }
@@ -1240,7 +1240,7 @@ static int stm32_mdma_resume(struct dma_chan *c)
 
        spin_unlock_irqrestore(&chan->vchan.lock, flags);
 
-       dev_dbg(chan2dev(chan), "vchan %p: resume\n", &chan->vchan);
+       dev_dbg(chan2dev(chan), "vchan %pK: resume\n", &chan->vchan);
 
        return 0;
 }
@@ -1656,7 +1656,7 @@ static int stm32_mdma_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = dma_async_device_register(dd);
+       ret = dmaenginem_async_device_register(dd);
        if (ret)
                return ret;
 
@@ -1674,8 +1674,6 @@ static int stm32_mdma_probe(struct platform_device *pdev)
        return 0;
 
 err_unregister:
-       dma_async_device_unregister(dd);
-
        return ret;
 }