| Message ID | 6bc35eca507359075528bc0e55938bc1ce8ee485.1565726867.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,01/10] powerpc/mm: drop ppc_md.iounmap() | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (da206bd46848568e1aaf35f00e2d78bf9bc94f95) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 19 lines checked |
On Tue, Aug 13, 2019 at 08:11:33PM +0000, Christophe Leroy wrote: > ppc_md.iounmap() is never set, drop it. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Hah, I was just going to send the same patch as part of an tree-wide ioremap related series.. Reviewed-by: Christoph Hellwig <hch@lst.de>
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);
ppc_md.iounmap() is never set, drop it. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/include/asm/machdep.h | 2 -- arch/powerpc/mm/pgtable_64.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-)