Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1191159

Re: [PATCH v2 1/2] drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style

Show all headers | View raw

On Thu, Jul 09, 2015 at 06:34:23PM -0700, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <mcgrof@suse.com>
> 
> 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@suse.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: dmaengine@vger.kernel.org
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: x86@kernel.org
> Link: http://lkml.kernel.org/r/1435258191-543-2-git-send-email-mcgrof@do-not-panic.com
> Signed-off-by: Borislav Petkov <bp@suse.de>
> ---
>  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 linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Re: [PATCH v2 1/2] drivers/dma/iop-adma: Use  dma_alloc_writecombine() kernel-style Vinod Koul <vinod.koul@intel.com> - 2015-07-23 19:30 +0200

csiph-web