From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f193.google.com ([209.85.208.193]:35637 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754492AbeGIN4o (ORCPT ); Mon, 9 Jul 2018 09:56:44 -0400 From: Serge Semin To: ralf@linux-mips.org, paul.burton@mips.com, jhogan@kernel.org Cc: okaya@codeaurora.org, chenhc@lemote.com, Sergey.Semin@t-platforms.ru, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Serge Semin , stable@vger.kernel.org Subject: [PATCH 2/2] mips: mm: Discard ioremap_uncached_accelerated() method Date: Mon, 9 Jul 2018 16:57:13 +0300 Message-Id: <20180709135713.8083-2-fancer.lancer@gmail.com> In-Reply-To: <20180709135713.8083-1-fancer.lancer@gmail.com> References: <20180709135713.8083-1-fancer.lancer@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: Adaptive ioremap_wc() method is now available (see "mips: mm: Create UCA-based ioremap_wc() method" commit). We can use it for UCA-featured MMIO transactions in the kernel, so we don't need it platform clone ioremap_uncached_accelerated() being declard. Seeing it is also unused anywhere in the kernel code, lets remove it from io.h arch-specific header then. Signed-off-by: Serge Semin Singed-off-by: Paul Burton Cc: James Hogan Cc: Ralf Baechle Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org --- arch/mips/include/asm/io.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index babe5155a..360b7ddeb 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -301,15 +301,11 @@ static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long si __ioremap_mode((offset), (size), boot_cpu_data.writecombine) /* - * These two are MIPS specific ioremap variant. ioremap_cacheable_cow - * requests a cachable mapping, ioremap_uncached_accelerated requests a - * mapping using the uncached accelerated mode which isn't supported on - * all processors. + * This is a MIPS specific ioremap variant. ioremap_cacheable_cow + * requests a cachable mapping with CWB attribute enabled. */ #define ioremap_cacheable_cow(offset, size) \ __ioremap_mode((offset), (size), _CACHE_CACHABLE_COW) -#define ioremap_uncached_accelerated(offset, size) \ - __ioremap_mode((offset), (size), _CACHE_UNCACHED_ACCELERATED) static inline void iounmap(const volatile void __iomem *addr) { -- 2.12.0