Message ID | 1389851246-8564-4-git-send-email-hongbo.zhang@freescale.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On Thu, Jan 16, 2014 at 01:47:22PM +0800, hongbo.zhang@freescale.com wrote: > From: Hongbo Zhang <hongbo.zhang@freescale.com> > > There are several places where descriptors are freed using identical code. > This patch puts this code into a function to reduce code duplication. > > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > Signed-off-by: Qiang Liu <qiang.liu@freescale.com> > --- > drivers/dma/fsldma.c | 38 ++++++++++++++++++++------------------ > 1 file changed, 20 insertions(+), 18 deletions(-) > > diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c > index 95236e6..ad73538 100644 > --- a/drivers/dma/fsldma.c > +++ b/drivers/dma/fsldma.c > @@ -418,6 +418,21 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx) > } > > /** > + * fsl_dma_free_descriptor - Free descriptor from channel's DMA pool. > + * @chan : Freescale DMA channel > + * @desc: descriptor to be freed > + */ > +static void fsl_dma_free_descriptor(struct fsldma_chan *chan, > + struct fsl_desc_sw *desc) > +{ > + list_del(&desc->node); > +#ifdef FSL_DMA_LD_DEBUG > + chan_dbg(chan, "LD %p free\n", desc); > +#endif why not wrap the define stuff in the defination of chan_dbg rather than its usage :(
On 03/11/2014 07:06 PM, Vinod Koul wrote: > On Thu, Jan 16, 2014 at 01:47:22PM +0800, hongbo.zhang@freescale.com wrote: >> From: Hongbo Zhang <hongbo.zhang@freescale.com> >> >> There are several places where descriptors are freed using identical code. >> This patch puts this code into a function to reduce code duplication. >> >> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> >> Signed-off-by: Qiang Liu <qiang.liu@freescale.com> >> --- >> drivers/dma/fsldma.c | 38 ++++++++++++++++++++------------------ >> 1 file changed, 20 insertions(+), 18 deletions(-) >> >> diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c >> index 95236e6..ad73538 100644 >> --- a/drivers/dma/fsldma.c >> +++ b/drivers/dma/fsldma.c >> @@ -418,6 +418,21 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx) >> } >> >> /** >> + * fsl_dma_free_descriptor - Free descriptor from channel's DMA pool. >> + * @chan : Freescale DMA channel >> + * @desc: descriptor to be freed >> + */ >> +static void fsl_dma_free_descriptor(struct fsldma_chan *chan, >> + struct fsl_desc_sw *desc) >> +{ >> + list_del(&desc->node); >> +#ifdef FSL_DMA_LD_DEBUG >> + chan_dbg(chan, "LD %p free\n", desc); >> +#endif > why not wrap the define stuff in the defination of chan_dbg rather than its > usage :( > OK, I will fix it by another separate patch. Thanks.
On 03/28/2014 11:44 AM, Hongbo Zhang wrote: > > On 03/11/2014 07:06 PM, Vinod Koul wrote: >> On Thu, Jan 16, 2014 at 01:47:22PM +0800, hongbo.zhang@freescale.com >> wrote: >>> From: Hongbo Zhang <hongbo.zhang@freescale.com> >>> >>> There are several places where descriptors are freed using identical >>> code. >>> This patch puts this code into a function to reduce code duplication. >>> >>> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> >>> Signed-off-by: Qiang Liu <qiang.liu@freescale.com> >>> --- >>> drivers/dma/fsldma.c | 38 ++++++++++++++++++++------------------ >>> 1 file changed, 20 insertions(+), 18 deletions(-) >>> >>> diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c >>> index 95236e6..ad73538 100644 >>> --- a/drivers/dma/fsldma.c >>> +++ b/drivers/dma/fsldma.c >>> @@ -418,6 +418,21 @@ static dma_cookie_t fsl_dma_tx_submit(struct >>> dma_async_tx_descriptor *tx) >>> } >>> /** >>> + * fsl_dma_free_descriptor - Free descriptor from channel's DMA pool. >>> + * @chan : Freescale DMA channel >>> + * @desc: descriptor to be freed >>> + */ >>> +static void fsl_dma_free_descriptor(struct fsldma_chan *chan, >>> + struct fsl_desc_sw *desc) >>> +{ >>> + list_del(&desc->node); >>> +#ifdef FSL_DMA_LD_DEBUG >>> + chan_dbg(chan, "LD %p free\n", desc); >>> +#endif >> why not wrap the define stuff in the defination of chan_dbg rather >> than its >> usage :( >> > > OK, I will fix it by another separate patch. > Thanks. > Think it again, I'd like to remove the FSL_DMA_LD_DEBUG usage, because the chan_dbg is a wrapper of dev_dbg, we do have macro to switch on/off dev_dbg, and most of other codes are calling chan_dbg directly without FSL_DMA_LD_DEBUG, the FSL_DMA_LD_DEBUG only shows up 3 times unnecessarily. > > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 95236e6..ad73538 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -418,6 +418,21 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx) } /** + * fsl_dma_free_descriptor - Free descriptor from channel's DMA pool. + * @chan : Freescale DMA channel + * @desc: descriptor to be freed + */ +static void fsl_dma_free_descriptor(struct fsldma_chan *chan, + struct fsl_desc_sw *desc) +{ + list_del(&desc->node); +#ifdef FSL_DMA_LD_DEBUG + chan_dbg(chan, "LD %p free\n", desc); +#endif + dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys); +} + +/** * fsl_dma_alloc_descriptor - Allocate descriptor from channel's DMA pool. * @chan : Freescale DMA channel * @@ -491,13 +506,8 @@ static void fsldma_free_desc_list(struct fsldma_chan *chan, { struct fsl_desc_sw *desc, *_desc; - list_for_each_entry_safe(desc, _desc, list, node) { - list_del(&desc->node); -#ifdef FSL_DMA_LD_DEBUG - chan_dbg(chan, "LD %p free\n", desc); -#endif - dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys); - } + list_for_each_entry_safe(desc, _desc, list, node) + fsl_dma_free_descriptor(chan, desc); } static void fsldma_free_desc_list_reverse(struct fsldma_chan *chan, @@ -505,13 +515,8 @@ static void fsldma_free_desc_list_reverse(struct fsldma_chan *chan, { struct fsl_desc_sw *desc, *_desc; - list_for_each_entry_safe_reverse(desc, _desc, list, node) { - list_del(&desc->node); -#ifdef FSL_DMA_LD_DEBUG - chan_dbg(chan, "LD %p free\n", desc); -#endif - dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys); - } + list_for_each_entry_safe_reverse(desc, _desc, list, node) + fsl_dma_free_descriptor(chan, desc); } /** @@ -827,10 +832,7 @@ static void fsldma_cleanup_descriptor(struct fsldma_chan *chan, dma_run_dependencies(txd); dma_descriptor_unmap(txd); -#ifdef FSL_DMA_LD_DEBUG - chan_dbg(chan, "LD %p free\n", desc); -#endif - dma_pool_free(chan->desc_pool, desc, txd->phys); + fsl_dma_free_descriptor(chan, desc); } /**