Messages in this thread Patch in this message | | | From | Guenter Roeck <> | Subject | [PATCH -next] MIPS: Netlogic: Fix build error | Date | Tue, 25 Aug 2015 09:29:10 -0700 |
| |
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") 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; -- 2.1.4
| |