lkml.org 
[lkml]   [2015]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH -next] MIPS: Netlogic: Fix build error
On 08/25/2015 09:29 AM, Guenter Roeck wrote:
> dma_alloc_from_coherent is defined as (0) if HAVE_GENERIC_DMA_COHERENT
> is not configured. This results in the following build error, seen
> with nlm_xlp_defconfig.
>
> arch/mips/netlogic/common/nlm-dma.c: In function 'nlm_dma_alloc_coherent':
> arch/mips/netlogic/common/nlm-dma.c:50:8: error: unused variable 'ret'
>
> Add __maybe_unused to the variable declaration to fix the problem.
>
> Fixes: 79f8511c83f1 ("MIPS: Netlogic: SWIOTLB dma ops for 32-bit DMA")

Upon reflection, I think the problem may have been introduced by changes
in the definition of dma_alloc_from_coherent(), not by the above patch.
Not sure how to fix that properly.

Guenter

> Cc: Jayachandran C <jchandra@broadcom.com>
> Cc: Ganesan Ramalingam <ganesanr@broadcom.com>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/mips/netlogic/common/nlm-dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/netlogic/common/nlm-dma.c b/arch/mips/netlogic/common/nlm-dma.c
> index f3d4ae87abc7..4982d97d279f 100644
> --- a/arch/mips/netlogic/common/nlm-dma.c
> +++ b/arch/mips/netlogic/common/nlm-dma.c
> @@ -47,7 +47,7 @@ static char *nlm_swiotlb;
> static void *nlm_dma_alloc_coherent(struct device *dev, size_t size,
> dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
> {
> - void *ret;
> + void __maybe_unused *ret;
>
> if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
> return ret;
>



\
 
 \ /
  Last update: 2015-08-25 19:21    [W:0.047 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site