Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp472747imm; Fri, 11 May 2018 01:01:59 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrgP5t19vW1Hz3UrllUekLbr/hvjYrhLVxFJHahhLKAThmJRL/RJjJ2rUOjpEcFXIT+VcWu X-Received: by 2002:a17:902:5ac1:: with SMTP id g1-v6mr4514235plm.43.1526025719777; Fri, 11 May 2018 01:01:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526025719; cv=none; d=google.com; s=arc-20160816; b=qTBRhXaSb+m+cohtRvwNWCg3O4DuMAFcopU5u/UNHC+vTNIelPQTe9gS255ByTbzqO eFtGFkdDquhqp1G+Au3K1XO/jugFDa/cvQGgmCRYGYRw+Vb54Ab3/ayL1kcWzMnmmMZC fiH2gAoYc8OV7hsoHe636M3V8BlgYS3gvAiFrIoXmoVUKOzx7B8kKWoGXsGNZ+vgnv/g MOHzi9oJNN+rFBgaFH9edtvsW/cX7l+gzn5/uzo8jRMSrqSeapw8wXIeo8D9PNGJN22j ylF57+N65NWQoZvCflwpJ0dhw9m3yEEP77P7Acw90YIz5gVLU/hiH1ndYz9P78P+xIS3 nZ8Q== 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=LLyJNtx/BepX/M+B24u3RCr0bz9L10S56ZmhZoMND1w=; b=XD7oQAOm02FxAS40j+mHcmjEYfLUZDVHNz6l5WUjnDuq+dn/zXMSxGiuMm9+fRHwYz 3/ZSg3PzU+D5xQYgQ5TU9QDXrJEmyh9CPwQuBjXc8LyOfYeAEvhLS+QbTWlFDfgtGjxr DX6d1XJOwSt4CsAJ6wJUz9JUZXVPpOP2VH3u0RG8TL1JF+8M14oiDycpQeFg4CXozz5P WtIJnmtulTbk0oujzsEz0qfbcpjELq/TkDiQNGnItTkFWSc/zFTkeLljAF9kS4olXuNS +yAOWfnHNfjdwWXNDk5gyJeFYjd3ktgP4nr1GCSwkriJSg7tYcZ8UAuByUbJ46rmDm5X AaTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=cgKDv6aL; 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 q23-v6si2789502pfj.8.2018.05.11.01.01.45; Fri, 11 May 2018 01:01:59 -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=cgKDv6aL; 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 S1752917AbeEKIBb (ORCPT + 99 others); Fri, 11 May 2018 04:01:31 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:35778 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752896AbeEKIB1 (ORCPT ); Fri, 11 May 2018 04:01:27 -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=LLyJNtx/BepX/M+B24u3RCr0bz9L10S56ZmhZoMND1w=; b=cgKDv6aLFwgEd0wOHR2nnt3iN DI2mSO97yVTRoxC0l6IYeZegYzOBkij08O46SFQZy6Q2NnRo0MxVfMQFfj9jjY2oD7HoLc16BaVEL gTUNmUniwn5cuG3rvXE07T1zfFKSl87d621OamSFxK5uH1wMrEO4JIF89FJQv8+nwjGByO2eB7kOh YJxCVZvodLBg5bvIRqYdF1s0unXYzJFrNBHlbggjhsAVcCdQtiIROQDmDDzKSO2DFy8TB6oJmIqhA UfKoIhMfsqEIoxJJe5wE6CJxiRX5kqcELwx81MZa7ONY5Lz36HXzrvZDuT5R6fzMf/EP3441jJZMp LE3ldbBQg==; Received: from 213-225-15-246.nat.highway.a1.net ([213.225.15.246] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fH2z8-00087E-V2; Fri, 11 May 2018 08:01:05 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org Cc: linux-arch@vger.kernel.org, Michal Simek , Greentime Hu , Vincent Chen , linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-m68k@lists.linux-m68k.org, nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/20] microblaze: remove the consistent_sync and consistent_sync_page Date: Fri, 11 May 2018 09:59:34 +0200 Message-Id: <20180511075945.16548-10-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511075945.16548-1-hch@lst.de> References: <20180511075945.16548-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 Both unused. Signed-off-by: Christoph Hellwig --- arch/microblaze/include/asm/pgtable.h | 3 -- arch/microblaze/mm/consistent.c | 45 --------------------------- 2 files changed, 48 deletions(-) diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index 8a2e654b709f..7b650ab14fa0 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -553,9 +553,6 @@ void __init *early_get_page(void); extern unsigned long ioremap_bot, ioremap_base; -void consistent_sync(void *vaddr, size_t size, int direction); -void consistent_sync_page(struct page *page, unsigned long offset, - size_t size, int direction); unsigned long consistent_virt_to_pfn(void *vaddr); void setup_memory(void); diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c index b9a9c8c3397b..c9a278ac795a 100644 --- a/arch/microblaze/mm/consistent.c +++ b/arch/microblaze/mm/consistent.c @@ -220,48 +220,3 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, flush_tlb_all(); #endif } - -/* - * make an area consistent. - */ -void consistent_sync(void *vaddr, size_t size, int direction) -{ - unsigned long start; - unsigned long end; - - start = (unsigned long)vaddr; - - /* Convert start address back down to unshadowed memory region */ -#ifdef CONFIG_XILINX_UNCACHED_SHADOW - start &= ~UNCACHED_SHADOW_MASK; -#endif - end = start + size; - - switch (direction) { - case PCI_DMA_NONE: - BUG(); - case PCI_DMA_FROMDEVICE: /* invalidate only */ - invalidate_dcache_range(start, end); - break; - case PCI_DMA_TODEVICE: /* writeback only */ - flush_dcache_range(start, end); - break; - case PCI_DMA_BIDIRECTIONAL: /* writeback and invalidate */ - flush_dcache_range(start, end); - break; - } -} -EXPORT_SYMBOL(consistent_sync); - -/* - * consistent_sync_page makes memory consistent. identical - * to consistent_sync, but takes a struct page instead of a - * virtual address - */ -void consistent_sync_page(struct page *page, unsigned long offset, - size_t size, int direction) -{ - unsigned long start = (unsigned long)page_address(page) + offset; - consistent_sync((void *)start, size, direction); -} -EXPORT_SYMBOL(consistent_sync_page); -- 2.17.0