From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 062FEC3A5A7 for ; Fri, 30 Aug 2019 06:29:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B90FE20659 for ; Fri, 30 Aug 2019 06:29:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="olmX6PFW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B90FE20659 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6E1856B000D; Fri, 30 Aug 2019 02:29:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 691486B000E; Fri, 30 Aug 2019 02:29:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A7F46B0010; Fri, 30 Aug 2019 02:29:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id 324956B000D for ; Fri, 30 Aug 2019 02:29:49 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id D8A8B1B65A for ; Fri, 30 Aug 2019 06:29:48 +0000 (UTC) X-FDA: 75878118456.16.cover47_55a6528d05d11 X-HE-Tag: cover47_55a6528d05d11 X-Filterd-Recvd-Size: 5126 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Fri, 30 Aug 2019 06:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=Sn/QnlX0rzEihI8HOssDpQ+pS1nF5+oT1o59+Mon2VE=; b=olmX6PFWaRCNDeJRTc5ka9YH2y XXCmdUKALA1NTuT0dtoXbnlJ9dNkn8+by+C49GsXU2agUVxgZTgTL5dBH5BUGJo4qfQO4B8Zk9XUs TWMm4gqIDq9p9UJBw15uS9ptf7dFIVbdr+4Pvt5Snzx+WsH6r63jHfo7i9baTeQewLbKKmq6hJOnh tX5bIp8RCcwLgTfStdgPphKMtoW8aHnE2ontZr3OHksEtjKVniMgTBrCIhLbmxz6/3+MEuduEv7AY dhsPK6CrhXLDXjEv3lEJ3GndzUttSUc5u3IV8AsMTI8tfuwFy0HZXHxKm/RTkO3j5fgqgDGrfxJqs iKZMjMuQ==; Received: from [93.83.86.253] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1i3aPj-0002vk-8g; Fri, 30 Aug 2019 06:29:40 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org Cc: Russell King , Robin Murphy , linux-arm-kernel@lists.infradead.org, linux-xtensa@linux-xtensa.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] arm: remove wrappers for the generic dma remap helpers Date: Fri, 30 Aug 2019 08:29:24 +0200 Message-Id: <20190830062924.21714-5-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190830062924.21714-1-hch@lst.de> References: <20190830062924.21714-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Remove a few tiny wrappers around the generic dma remap code. Signed-off-by: Christoph Hellwig --- arch/arm/mm/dma-mapping.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index d07e5c865557..8cb57f1664b2 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -336,18 +336,6 @@ static void *__alloc_remap_buffer(struct device *dev= , size_t size, gfp_t gfp, pgprot_t prot, struct page **ret_page, const void *caller, bool want_vaddr); =20 -static void * -__dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t pr= ot, - const void *caller) -{ - return dma_common_contiguous_remap(page, size, prot, caller); -} - -static void __dma_free_remap(void *cpu_addr, size_t size) -{ - dma_common_free_remap(cpu_addr, size); -} - #define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K static struct gen_pool *atomic_pool __ro_after_init; =20 @@ -503,7 +491,7 @@ static void *__alloc_remap_buffer(struct device *dev,= size_t size, gfp_t gfp, if (!want_vaddr) goto out; =20 - ptr =3D __dma_alloc_remap(page, size, gfp, prot, caller); + ptr =3D dma_common_contiguous_remap(page, size, prot, caller); if (!ptr) { __dma_free_buffer(page, size); return NULL; @@ -570,7 +558,7 @@ static void *__alloc_from_contiguous(struct device *d= ev, size_t size, goto out; =20 if (PageHighMem(page)) { - ptr =3D __dma_alloc_remap(page, size, GFP_KERNEL, prot, caller); + ptr =3D dma_common_contiguous_remap(page, size, prot, caller); if (!ptr) { dma_release_from_contiguous(dev, page, count); return NULL; @@ -590,7 +578,7 @@ static void __free_from_contiguous(struct device *dev= , struct page *page, { if (want_vaddr) { if (PageHighMem(page)) - __dma_free_remap(cpu_addr, size); + dma_common_free_remap(cpu_addr, size); else __dma_remap(page, size, PAGE_KERNEL); } @@ -682,7 +670,7 @@ static void *remap_allocator_alloc(struct arm_dma_all= oc_args *args, static void remap_allocator_free(struct arm_dma_free_args *args) { if (args->want_vaddr) - __dma_free_remap(args->cpu_addr, args->size); + dma_common_free_remap(args->cpu_addr, args->size); =20 __dma_free_buffer(args->page, args->size); } @@ -1365,16 +1353,6 @@ static int __iommu_free_buffer(struct device *dev,= struct page **pages, return 0; } =20 -/* - * Create a CPU mapping for a specified pages - */ -static void * -__iommu_alloc_remap(struct page **pages, size_t size, gfp_t gfp, pgprot_= t prot, - const void *caller) -{ - return dma_common_pages_remap(pages, size, prot, caller); -} - /* * Create a mapping in device IO address space for specified pages */ @@ -1526,7 +1504,7 @@ static void *__arm_iommu_alloc_attrs(struct device = *dev, size_t size, if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) return pages; =20 - addr =3D __iommu_alloc_remap(pages, size, gfp, prot, + addr =3D dma_common_pages_remap(pages, size, prot, __builtin_return_address(0)); if (!addr) goto err_mapping; --=20 2.20.1