On Tue, Jan 28, 2014 at 09:45:38PM +0100, Arnd Bergmann wrote:
> The merge between 2b7f65b11d87f "mmp_pdma: Style neatening" and
> 8010dad55a0ab0 "dma: add dma_get_any_slave_channel(), for use in of_xlate()"
> caused a build error by leaving obsolete code in place:
>
> mmp_pdma.c: In function 'mmp_pdma_dma_xlate':
> mmp_pdma.c:909:31: error: 'candidate' undeclared
> mmp_pdma.c:912:3: error: label 'retry' used but not defined
> mmp_pdma.c:901:24: warning: unused variable 'c' [-Wunused-variable]
>
> This removes the extraneous lines.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
Applied thanks
--
~Vinod
>
> diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
> index 32e58ee..69c6a12 100644
> --- a/drivers/dma/mmp_pdma.c
> +++ b/drivers/dma/mmp_pdma.c
> @@ -898,19 +898,11 @@ static struct dma_chan *mmp_pdma_dma_xlate(struct
> of_phandle_args *dma_spec,
> {
> struct mmp_pdma_device *d = ofdma->of_dma_data;
> struct dma_chan *chan;
> - struct mmp_pdma_chan *c;
>
> chan = dma_get_any_slave_channel(&d->device);
> if (!chan)
> return NULL;
>
> - /* dma_get_slave_channel will return NULL if we lost a race between
> - * the lookup and the reservation */
> - chan = dma_get_slave_channel(candidate);
> -
> - if (!chan)
> - goto retry;
> -
> to_mmp_pdma_chan(chan)->drcmr = dma_spec->args[0];
>
> return chan;
>
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
