On Thu, Jul 09, 2015 at 06:34:23PM -0700, Luis R. Rodriguez wrote: > From: "Luis R. Rodriguez" <mcgrof@xxxxxxxx> > > dma_alloc_writecombine()'s call and return value check is tangled in all > in one call. Untangle both calls according to kernel coding style. > This looks okay, does it have dependency on anything Is this intended to be applied thru dmaengine tree or x86? -- ~Vinod > Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx> > Cc: Dan Williams <dan.j.williams@xxxxxxxxx> > Cc: dmaengine@xxxxxxxxxxxxxxx > Cc: Vinod Koul <vinod.koul@xxxxxxxxx> > Cc: x86@xxxxxxxxxx > Link: http://lkml.kernel.org/r/1435258191-543-2-git-send-email-mcgrof@xxxxxxxxxxxxxxxx > Signed-off-by: Borislav Petkov <bp@xxxxxxx> > --- > drivers/dma/iop-adma.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c > index 998826854fdd..e4f43125e0fb 100644 > --- a/drivers/dma/iop-adma.c > +++ b/drivers/dma/iop-adma.c > @@ -1300,10 +1300,11 @@ static int iop_adma_probe(struct platform_device *pdev) > * note: writecombine gives slightly better performance, but > * requires that we explicitly flush the writes > */ > - if ((adev->dma_desc_pool_virt = dma_alloc_writecombine(&pdev->dev, > - plat_data->pool_size, > - &adev->dma_desc_pool, > - GFP_KERNEL)) == NULL) { > + adev->dma_desc_pool_virt = dma_alloc_writecombine(&pdev->dev, > + plat_data->pool_size, > + &adev->dma_desc_pool, > + GFP_KERNEL); > + if (!adev->dma_desc_pool_virt) { > ret = -ENOMEM; > goto err_free_adev; > } > -- > 2.3.2.209.gd67f9d5.dirty > -- -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
