From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754940AbbIHNTg (ORCPT ); Tue, 8 Sep 2015 09:19:36 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35614 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754569AbbIHNSv (ORCPT ); Tue, 8 Sep 2015 09:18:51 -0400 From: Sudip Mukherjee To: Chris Zankel , Max Filippov Cc: linux-kernel@vger.kernel.org, Andrew Morton , Christoph Hellwig , linux-xtensa@linux-xtensa.org, Sudip Mukherjee Subject: [PATCH 2/4] xtensa: fix error with dma_supported Date: Tue, 8 Sep 2015 18:48:32 +0530 Message-Id: <1441718314-11208-3-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441718314-11208-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1441718314-11208-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit 11bd9421d0ad ("dma-mapping: cosolidate dma_mapping_error") has removed dma_mapping_error() from arch specific file to asm-generic/dma-mapping-common.h but it was not removed from xtensa architecture and as a result we were getting error like: error: redefinition of 'dma_mapping_error' while building with allmodconfig. Signed-off-by: Sudip Mukherjee --- arch/xtensa/include/asm/dma-mapping.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index bf24c90..5762d8d 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -36,15 +36,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) #define dma_free_noncoherent(d, s, v, h) dma_free_attrs(d, s, v, h, NULL) static inline int -dma_mapping_error(struct device *dev, dma_addr_t dma_addr) -{ - struct dma_map_ops *ops = get_dma_ops(dev); - - debug_dma_mapping_error(dev, dma_addr); - return ops->mapping_error(dev, dma_addr); -} - -static inline int dma_supported(struct device *dev, u64 mask) { return 1; -- 1.9.1