Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp5660104imm; Mon, 27 Aug 2018 01:48:51 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYkLpzDZGo+s2VJsWiScZnNILqg5HMbMhJ1nIhHhIlkd4tc8szovGyFvUx5j8vAFmLy3oDm X-Received: by 2002:a17:902:bb0c:: with SMTP id l12-v6mr12304983pls.5.1535359731497; Mon, 27 Aug 2018 01:48:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535359731; cv=none; d=google.com; s=arc-20160816; b=bn2mOeWa9galXrMSnIMyHVPoUYyFESvfranCzlcf8WM4VYs/mZ1IsJ/FKBx4WyZgly 47HDebXilccFqmjusMJkUfX5U5DCgWr7LAIdyBGFeZ740MtT6SJd5JtiTepjLr4FSbpm Jm7ygFaGhh4mqRIfEp98QyI4h0CjJ2mrUnz/1PS37pg2CsSAuLAbJNkfyVFPP3aWb97g OtXnWqrLAV5jiQhyaoA2wwHVAucpg6Wewg4sw5ZOjAPHvAqqsSeVKazguA70djXwyiVF 6zyHTJWk3QsWzyGuemDSwN9+S4MSgis0H+9TKcHsXXJMBFRqeDVXYtWELjo+MBWtWbL/ kPEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=QB2nKWrGzUL/OrIe0DygrB4+3NzZfY8/MFfXL059fHs=; b=p6dVFysOIYGl8PPSGH7si2UcHRMNR3xCLAnjw9itrsE7lJ2QyX5OZyBEQVb7HWqk7j dkRO42cWbiHmKJ4fo2KESAkZfPrwjfNEiQ370/hk1Tj1upE9VZfx+P/cu6sqm4DsDSNM AituTdF5K7eC5U+jDuT8Wz9D9AcaVrA1PBjESh3yWEo3Iy8kuGpu14hm2rNYaEsB/vEa vkgNqSPjp/KA8sfgvcZ6IWID+3vGGaPxJ+8sS4Zadhc6pO0+6QaVdgON5/9/C1aQqfdJ W6aTQ/I4SuKqI0ns4zxWgYGykIhzBZ09CLUapGy4VCk8RDwzyVsBDcJF+gE/eF96wnxw FHbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=nqUlVJNO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d27-v6si13443177pgm.428.2018.08.27.01.48.36; Mon, 27 Aug 2018 01:48:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=nqUlVJNO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727212AbeH0MdM (ORCPT + 99 others); Mon, 27 Aug 2018 08:33:12 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:46964 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726802AbeH0MdM (ORCPT ); Mon, 27 Aug 2018 08:33:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QB2nKWrGzUL/OrIe0DygrB4+3NzZfY8/MFfXL059fHs=; b=nqUlVJNO6SdXUBoqOKi/fGB4l FD3oEpDrpcy33+nEu+shoAd8KduvrgVLS7F/s27c5OGMSF35iIRb9yeEx+t6t9C+P5OQrPmMMN585 ZZLN4V80YRZmqDNAlly9XoKYgcAdiaPnPgiV85TIxGbIKqhpR5rwVOaZC6Ly6Qa77DLUkBk+nTX2y FsJ4IFc+EUCAH1y3fdm8KEiz5y7B/V5uAW0nyPd4+cgcJvD/1RU5zIFhU+O4q7cQp3YjTg9CR6nkY ye+P+eA24bQGVX2/yu7mtU4UYq7aJxEaWKAk1yO0AP1eCmtgmdfz7nPT+hDB5H1haJww6liDTKJ6+ e3yW68nHg==; Received: from 213-225-1-219.nat.highway.a1.net ([213.225.1.219] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuDB7-0002Kv-Sc; Mon, 27 Aug 2018 08:47:18 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org Cc: Marek Szyprowski , Robin Murphy , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] arm-nommu: don't define arch_teardown_dma_ops Date: Mon, 27 Aug 2018 10:47:08 +0200 Message-Id: <20180827084711.23407-2-hch@lst.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180827084711.23407-1-hch@lst.de> References: <20180827084711.23407-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can just use the default implementation. Signed-off-by: Christoph Hellwig --- arch/arm/include/asm/dma-mapping.h | 2 ++ arch/arm/mm/dma-mapping-nommu.c | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 8436f6ade57d..965b7c846ecb 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -100,8 +100,10 @@ static inline unsigned long dma_max_pfn(struct device *dev) extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, const struct iommu_ops *iommu, bool coherent); +#ifdef CONFIG_MMU #define arch_teardown_dma_ops arch_teardown_dma_ops extern void arch_teardown_dma_ops(struct device *dev); +#endif /* do not use this function in a driver */ static inline bool is_device_dma_coherent(struct device *dev) diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c index f448a0663b10..aa7aba302e76 100644 --- a/arch/arm/mm/dma-mapping-nommu.c +++ b/arch/arm/mm/dma-mapping-nommu.c @@ -237,7 +237,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, set_dma_ops(dev, dma_ops); } - -void arch_teardown_dma_ops(struct device *dev) -{ -} -- 2.18.0