Re: [PATCH v1 01/10] powerpc/mm: drop ppc_md.iounmap()

2019-08-13 Thread Christoph Hellwig
On Tue, Aug 13, 2019 at 08:11:33PM +, Christophe Leroy wrote:
> ppc_md.iounmap() is never set, drop it.
> 
> Signed-off-by: Christophe Leroy 

Hah, I was just going to send the same patch as part of an tree-wide
ioremap related series..

Reviewed-by: Christoph Hellwig 


[PATCH v1 01/10] powerpc/mm: drop ppc_md.iounmap()

2019-08-13 Thread Christophe Leroy
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