Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp4109321ybl; Tue, 20 Aug 2019 07:09:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyAF40x+JZ2Jr/uQWtY7yEapa7jiQaFqHM1RHTQ1hKWyPmYkoz8kWB8S0VsSeFqt/zxttlC X-Received: by 2002:a65:4808:: with SMTP id h8mr24739132pgs.22.1566310185616; Tue, 20 Aug 2019 07:09:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566310185; cv=none; d=google.com; s=arc-20160816; b=HH2WXbLpEecGAl1JkAbxBeTv4/d3VI0bIV7IjeqZ+nplRqfCqIhyaaMZ7DHlshGWwj wqprKN21Mzg2/A8zrE7CLMrCUDRSR18Wy978ONr1AsoWgTGGii1ZOxqNdE1LEQ4KuCYC lQfvesmwaijge1CjW7bu+EwDo4nwEmJrJm8Uulymr1PIedja1BTvJpkfUefzBGbrK0nc yxkoj48wNtIFD42pobNAfYNVSzGx6caQxeO5RxhKrXIPiknq432QSTDwCksoGWTn/FMr 1mF8Lf/I7qO1M5fHWQ8hhPXkNpLPO5nBdF+/qJsXbzudA5bwxBv+g0kLA9TWEBmZBXiS iFuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=wYmWQVbOL8+HyhpkF7UnISkf2nMl4sTU2NwnfBVkSic=; b=OZbXcCs8SUj/299nMTjstM3sF1FDCEg/PV3TaN8a4sM+A8dRa2FnjmZ35JGkBmAIso Nyu1nVOXELVQQOgvjzx8kksSEIejtEFgtW7szcIrlArxymLQgNrgVDeRmLwYdduG7ve1 42T9VFwFR0T04RMn6Ru4EYDu2vv+smbo2gnoQCBsbUxN2vBLsVBDZsppONegkKyTeI21 XZZ/SSYdkAGfdp/suJk17deM1CkJOnahIprTEZRe2qS3nJDtU23ET1FcXhSIAuDSWbNs k4NhNFRNvcoyqiQYpFIEOApQJQYcPbez4ZqF/h/i79vdFaYWb+bn5+ZEURfiMdT8V61w Z87Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=VRyHc+g2; 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 184si12232385pga.23.2019.08.20.07.09.29; Tue, 20 Aug 2019 07:09:45 -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=pass header.i=@c-s.fr header.s=mail header.b=VRyHc+g2; 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 S1729970AbfHTOHx (ORCPT + 99 others); Tue, 20 Aug 2019 10:07:53 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:30751 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730114AbfHTOHO (ORCPT ); Tue, 20 Aug 2019 10:07:14 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 46CXfm4NrVz9v0Gg; Tue, 20 Aug 2019 16:07:12 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=VRyHc+g2; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id hklT6zho8N0y; Tue, 20 Aug 2019 16:07:12 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 46CXfm3D1Jz9v0GZ; Tue, 20 Aug 2019 16:07:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1566310032; bh=wYmWQVbOL8+HyhpkF7UnISkf2nMl4sTU2NwnfBVkSic=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=VRyHc+g2lcnsNgDrluO1aW6YmcSnztD3Xp6HxV+1VRwSs1VSBtlMxsm9clacEjkKb lEyLIp3g804qEptg5KC4saUF4mxMy/Nljx5BBCe0RZ+i4l4sI4T1S0B45q3RyGRXZH DyI5E9fGXNza2EqwcpOzTCLCiR/DqVrruCV9PH7M= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id AF1F98B7D0; Tue, 20 Aug 2019 16:07:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 4IEqfRPCvbSD; Tue, 20 Aug 2019 16:07:12 +0200 (CEST) Received: from pc16032vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 72AB08B7C9; Tue, 20 Aug 2019 16:07:12 +0200 (CEST) Received: by pc16032vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 5C0D06B734; Tue, 20 Aug 2019 14:07:12 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 04/12] powerpc/mm: drop function __ioremap() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com, hch@lst.de Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 20 Aug 2019 14:07:12 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __ioremap() is not used anymore, drop it. Suggested-by: Christoph Hellwig Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/io.h | 6 ------ arch/powerpc/mm/pgtable_32.c | 11 ++--------- arch/powerpc/mm/pgtable_64.c | 7 ------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 02d6256fe1ea..8e65ba59f06a 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -705,10 +705,6 @@ static inline void iosync(void) * create hand-made mappings for use only by the PCI code and cannot * currently be hooked. Must be page aligned. * - * * __ioremap is the low level implementation used by ioremap and - * ioremap_prot and cannot be hooked (but can be used by a hook on one - * of the previous ones) - * * * __ioremap_caller is the same as above but takes an explicit caller * reference rather than using __builtin_return_address(0) * @@ -726,8 +722,6 @@ void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size); extern void iounmap(volatile void __iomem *addr); -extern void __iomem *__ioremap(phys_addr_t, unsigned long size, - unsigned long flags); extern void __iomem *__ioremap_caller(phys_addr_t, unsigned long size, pgprot_t prot, void *caller); diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 35cb96cfc258..848ee4a30dd1 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c @@ -92,12 +92,6 @@ ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) EXPORT_SYMBOL(ioremap_prot); void __iomem * -__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) -{ - return __ioremap_caller(addr, size, __pgprot(flags), __builtin_return_address(0)); -} - -void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *caller) { unsigned long v, i; @@ -127,8 +121,8 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *call */ if (slab_is_available() && p <= virt_to_phys(high_memory - 1) && page_is_ram(__phys_to_pfn(p))) { - printk("__ioremap(): phys addr 0x%llx is RAM lr %ps\n", - (unsigned long long)p, __builtin_return_address(0)); + pr_warn("%s(): phys addr 0x%llx is RAM lr %ps\n", __func__, + (unsigned long long)p, __builtin_return_address(0)); return NULL; } #endif @@ -171,7 +165,6 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, pgprot_t prot, void *call out: return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK)); } -EXPORT_SYMBOL(__ioremap); void iounmap(volatile void __iomem *addr) { diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 57cdd6182932..2882419737b9 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c @@ -203,12 +203,6 @@ void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, return ret; } -void __iomem * __ioremap(phys_addr_t addr, unsigned long size, - unsigned long flags) -{ - return __ioremap_caller(addr, size, __pgprot(flags), __builtin_return_address(0)); -} - void __iomem * ioremap(phys_addr_t addr, unsigned long size) { pgprot_t prot = pgprot_noncached(PAGE_KERNEL); @@ -286,7 +280,6 @@ void iounmap(volatile void __iomem *token) EXPORT_SYMBOL(ioremap); EXPORT_SYMBOL(ioremap_wc); EXPORT_SYMBOL(ioremap_prot); -EXPORT_SYMBOL(__ioremap); EXPORT_SYMBOL(__ioremap_at); EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(__iounmap_at); -- 2.13.3