From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754909AbbIHNTH (ORCPT ); Tue, 8 Sep 2015 09:19:07 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35700 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754884AbbIHNS7 (ORCPT ); Tue, 8 Sep 2015 09:18:59 -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 4/4] xtensa: fix error with dma_set_mask Date: Tue, 8 Sep 2015 18:48:34 +0530 Message-Id: <1441718314-11208-5-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 13bad70fb5ba ("dma-mapping: consolidate dma_set_mask") has removed dma_set_mask() from individual arch files to asm-generic/dma-mapping-common.h. But it was not removed for xtensa architecture and as a result we were getting errors like: error: redefinition of 'dma_set_mask' while building with allmodconfig. Signed-off-by: Sudip Mukherjee --- arch/xtensa/include/asm/dma-mapping.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index 019a94a..15992a3 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -43,17 +43,6 @@ dma_supported(struct device *dev, u64 mask) #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL) #define dma_free_noncoherent(d, s, v, h) dma_free_attrs(d, s, v, h, NULL) -static inline int -dma_set_mask(struct device *dev, u64 mask) -{ - if(!dev->dma_mask || !dma_supported(dev, mask)) - return -EIO; - - *dev->dma_mask = mask; - - return 0; -} - void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction); -- 1.9.1