[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1440533751-26147-1-git-send-email-linux@roeck-us.net>
Date: Tue, 25 Aug 2015 13:15:51 -0700
From: Guenter Roeck <linux@...ck-us.net>
To: Ralf Baechle <ralf@...ux-mips.org>
Cc: linux-mips@...ux-mips.org, linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>,
Guenter Roeck <linux@...ck-us.net>,
Christoph Hellwig <hch@....de>
Subject: [PATCH v2 -next] MIPS: Netlogic: Fix build error
The variable 'ret' is no longer used in nlm_dma_alloc_coherent()
and causes the following build error.
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'
Fixes: e4d0d18739dc ("dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}")
Cc: Christoph Hellwig <hch@....de>
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
---
Previous version was based on next-20150824 and got it all wrong.
It might make sense to merge this into Andrew's tree, or even into
the offending patch.
arch/mips/netlogic/common/nlm-dma.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/mips/netlogic/common/nlm-dma.c b/arch/mips/netlogic/common/nlm-dma.c
index 3e4f3bb1cf59..3758715d4ab6 100644
--- a/arch/mips/netlogic/common/nlm-dma.c
+++ b/arch/mips/netlogic/common/nlm-dma.c
@@ -47,8 +47,6 @@ 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;
-
/* ignore region specifiers */
gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists