Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1469214ybl; Tue, 13 Aug 2019 13:12:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqxuqjydkyuX1Z0b8NhXy3g95l14lfISxkuSsyFXg2+mh8Lat0VcH3KS7UrIFnDJmczXjG4Z X-Received: by 2002:a63:290:: with SMTP id 138mr32997891pgc.402.1565727150666; Tue, 13 Aug 2019 13:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565727150; cv=none; d=google.com; s=arc-20160816; b=RnfQZvr/hRk1NmmLqZ4zUhkBQ7ZjRv0inEMTBrH+I24N5zDR7yQ0Dw3kc/AAd8fEmd 6mYzGkd4C6/cC+uo2c0SXASZ2PfSy6FxWJpBHq9SnROrq+IIfIC9QH2cPCmqE5qob6XK iAFHx5FjRxjKR8BK9ck86nnYzgzYabuqblk2hsKju/mhabeHLEpqGeoXnMmcOTS4fF33 CjxUeoT42nT+3tHr18kgyED09wAeEIDYAGV7Do9xIuec2fjuYGIuLfeXI6OscejRh3B1 eS82HutwuXTodjKtLX4kR+UAgdyxZTlcRvYr3RKVnqbAWaodH9RMkI1u/WTijF6zGPTq 2IGw== 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:message-id :dkim-signature; bh=8VOS6jgi9G0MdN7ay7ZQc6ZBTXk/FFs3ZElp2pFbNEk=; b=Wm1qeEq3EOyr36HbMDbxIZdvyyhwcDQKYAUMpuumu/AtEShqtTDEmngXcVAZ1K8xWi cD3pF8dE0VpuVJo++HQfPXFc1BgZ63R+M2njTkHb8elDYh9M2vis3Gr7wVCAThmsYNc5 boRm91bXJa2ING3cGIJ77PP596sshtNB+Wh+7R+Aja8Bx/kf2OVi/ol+TygknVCwij2a +pLCfGU5cSVBRmadwmOBOjeyT0fS1dMt07o9F4gXEIyg8WQxs4xJwwo3CEmM1Hw9D1xU uh68ISw51j7nZcfbcTT5HBLo/WgaZSoJH1qvIYh8wERbYOIfrAz0QHtSAtNpxa+8uXYU iiSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=N8DH5uKB; 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 cd17si63785711plb.210.2019.08.13.13.12.14; Tue, 13 Aug 2019 13:12:30 -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=N8DH5uKB; 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 S1726751AbfHMULf (ORCPT + 99 others); Tue, 13 Aug 2019 16:11:35 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:48044 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726613AbfHMULf (ORCPT ); Tue, 13 Aug 2019 16:11:35 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 467P4Q2Cbcz9v05m; Tue, 13 Aug 2019 22:11:34 +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=N8DH5uKB; 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 DA5yvn1_sNFL; Tue, 13 Aug 2019 22:11:34 +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 467P4Q177nz9v05l; Tue, 13 Aug 2019 22:11:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1565727094; bh=8VOS6jgi9G0MdN7ay7ZQc6ZBTXk/FFs3ZElp2pFbNEk=; h=From:Subject:To:Cc:Date:From; b=N8DH5uKB8beVphdbroaduEpp/guIyO0EAvvyLdze381Jt/FJPQathFCyQgRmPUCXl 4ZfB17QG3NKRwsvnh7jXrUeKgzXh+Z+RTNz4MBWZRxw1SrTnjboammLYaq8yb50a/v 4OjuLUJ4Ls5yxPXsfNs1wgpEeu4c/OIr4HxeToD0= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 51A708B7F2; Tue, 13 Aug 2019 22:11:34 +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 YkZcs1CXmGYI; Tue, 13 Aug 2019 22:11:34 +0200 (CEST) Received: from pc17473vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1DCE68B7F0; Tue, 13 Aug 2019 22:11:34 +0200 (CEST) Received: by pc17473vm.idsi0.si.c-s.fr (Postfix, from userid 0) id DA37569632; Tue, 13 Aug 2019 20:11:33 +0000 (UTC) Message-Id: <6bc35eca507359075528bc0e55938bc1ce8ee485.1565726867.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH v1 01/10] powerpc/mm: drop ppc_md.iounmap() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 13 Aug 2019 20:11:33 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ppc_md.iounmap() is never set, drop it. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/machdep.h | 2 -- arch/powerpc/mm/pgtable_64.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index c43d6eca9edd..3370df4bdaa0 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -33,8 +33,6 @@ struct machdep_calls { #ifdef CONFIG_PPC64 void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size, pgprot_t prot, void *caller); - void (*iounmap)(volatile void __iomem *token); - #ifdef CONFIG_PM void (*iommu_save)(void); void (*iommu_restore)(void); diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 9ad59b733984..11eb90ea2d4f 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c @@ -285,10 +285,7 @@ void __iounmap(volatile void __iomem *token) void iounmap(volatile void __iomem *token) { - if (ppc_md.iounmap) - ppc_md.iounmap(token); - else - __iounmap(token); + __iounmap(token); } EXPORT_SYMBOL(ioremap); -- 2.13.3