| Message ID | 20131127000003.31233.64596.stgit@viggo.jf.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 89116bf962a358a6ad964a01a658d0392019a2de |
| Delegated to: | Vinod Koul |
| Headers | show |
On Tue, Nov 26, 2013 at 04:03:03PM -0800, Dan Williams wrote: > From: Russell King - ARM Linux <linux@arm.linux.org.uk> > > drivers/dma/amba-pl08x.c: In function 'pl08x_desc_free': > drivers/dma/amba-pl08x.c:1173:2: warning: passing argument 1 of 'dma_descriptor_unmap' from incompatible pointer type > include/linux/dmaengine.h:476:91: note: expected 'struct dma_async_tx_descriptor *' but argument is of type 'struct pl08x_txd *' > > Fixes: d38a8c622a1b ("dmaengine: prepare for generic 'unmap' data") > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Acked-by: Vinod Koul <vinod.koul@intel.com> > --- > > Adding to patchwork. > > This one slipped through the cracks and should not have... getting the > cross build environment back in shape. > > drivers/dma/amba-pl08x.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c > index 16a2aa28f856..ec4ee5c1fe9d 100644 > --- a/drivers/dma/amba-pl08x.c > +++ b/drivers/dma/amba-pl08x.c > @@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd) > struct pl08x_txd *txd = to_pl08x_txd(&vd->tx); > struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan); > > - dma_descriptor_unmap(txd); > + dma_descriptor_unmap(&vd->tx); > if (!txd->done) > pl08x_release_mux(plchan); > > > -- > To unsubscribe from this list: send the line "unsubscribe dmaengine" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 26, 2013 at 04:03:03PM -0800, Dan Williams wrote: > From: Russell King - ARM Linux <linux@arm.linux.org.uk> > > drivers/dma/amba-pl08x.c: In function 'pl08x_desc_free': > drivers/dma/amba-pl08x.c:1173:2: warning: passing argument 1 of 'dma_descriptor_unmap' from incompatible pointer type > include/linux/dmaengine.h:476:91: note: expected 'struct dma_async_tx_descriptor *' but argument is of type 'struct pl08x_txd *' > > Fixes: d38a8c622a1b ("dmaengine: prepare for generic 'unmap' data") > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Applied now Thanks -- ~Vinod > --- > > Adding to patchwork. > > This one slipped through the cracks and should not have... getting the > cross build environment back in shape. > > drivers/dma/amba-pl08x.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c > index 16a2aa28f856..ec4ee5c1fe9d 100644 > --- a/drivers/dma/amba-pl08x.c > +++ b/drivers/dma/amba-pl08x.c > @@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd) > struct pl08x_txd *txd = to_pl08x_txd(&vd->tx); > struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan); > > - dma_descriptor_unmap(txd); > + dma_descriptor_unmap(&vd->tx); > if (!txd->done) > pl08x_release_mux(plchan); > > > -- > To unsubscribe from this list: send the line "unsubscribe dmaengine" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 28, 2013 at 11:39:14AM +0530, Vinod Koul wrote: > On Tue, Nov 26, 2013 at 04:03:03PM -0800, Dan Williams wrote: > > From: Russell King - ARM Linux <linux@arm.linux.org.uk> > > > > drivers/dma/amba-pl08x.c: In function 'pl08x_desc_free': > > drivers/dma/amba-pl08x.c:1173:2: warning: passing argument 1 of 'dma_descriptor_unmap' from incompatible pointer type > > include/linux/dmaengine.h:476:91: note: expected 'struct dma_async_tx_descriptor *' but argument is of type 'struct pl08x_txd *' > > > > Fixes: d38a8c622a1b ("dmaengine: prepare for generic 'unmap' data") > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > Acked-by: Vinod Koul <vinod.koul@intel.com> Ditto. -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 16a2aa28f856..ec4ee5c1fe9d 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd) struct pl08x_txd *txd = to_pl08x_txd(&vd->tx); struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan); - dma_descriptor_unmap(txd); + dma_descriptor_unmap(&vd->tx); if (!txd->done) pl08x_release_mux(plchan);