From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933079AbbHYUP6 (ORCPT ); Tue, 25 Aug 2015 16:15:58 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:37327 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932103AbbHYUP4 (ORCPT ); Tue, 25 Aug 2015 16:15:56 -0400 From: Guenter Roeck To: Ralf Baechle Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Andrew Morton , Guenter Roeck , Christoph Hellwig Subject: [PATCH v2 -next] MIPS: Netlogic: Fix build error Date: Tue, 25 Aug 2015 13:15:51 -0700 Message-Id: <1440533751-26147-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Guenter Roeck --- 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