Re: [PATCH] dma: fix vchan_cookie_complete() debug print

[Dan Williams]

On Fri, Dec 6, 2013 at 7:42 AM, Jonas Jensen <jonas.jensen@xxxxxxxxx> wrote:
> vd->tx.cookie is set zero on dma_cookie_complete(),
> save to local before printing it.
>
> Signed-off-by: Jonas Jensen <jonas.jensen@xxxxxxxxx>
> ---
>
> Notes:
>     dev_vdbg() could also be moved to happen earlier, what do you prefer?
>
>     Applies to next-20131206
>
>  drivers/dma/virt-dma.h | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/virt-dma.h b/drivers/dma/virt-dma.h
> index 85c19d6..181b9526 100644
> --- a/drivers/dma/virt-dma.h
> +++ b/drivers/dma/virt-dma.h
> @@ -84,10 +84,12 @@ static inline bool vchan_issue_pending(struct virt_dma_chan *vc)
>  static inline void vchan_cookie_complete(struct virt_dma_desc *vd)
>  {
>         struct virt_dma_chan *vc = to_virt_chan(vd->tx.chan);
> +       dma_cookie_t cookie;
>
> +       cookie = vd->tx.cookie;
>         dma_cookie_complete(&vd->tx);
>         dev_vdbg(vc->chan.device->dev, "txd %p[%x]: marked complete\n",
> -               vd, vd->tx.cookie);
> +                vd, cookie);
>         list_add_tail(&vd->node, &vc->desc_completed);


This is a bit smaller:

diff --git a/drivers/dma/virt-dma.h b/drivers/dma/virt-dma.h
index 85c19d63f9fb..7d6f611c7654 100644
--- a/drivers/dma/virt-dma.h
+++ b/drivers/dma/virt-dma.h
@@ -85,9 +85,9 @@ static inline void vchan_cookie_complete(struct
virt_dma_desc *vd)
 {
        struct virt_dma_chan *vc = to_virt_chan(vd->tx.chan);

-       dma_cookie_complete(&vd->tx);
        dev_vdbg(vc->chan.device->dev, "txd %p[%x]: marked complete\n",
                vd, vd->tx.cookie);
+       dma_cookie_complete(&vd->tx);
        list_add_tail(&vd->node, &vc->desc_completed);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/