| Message ID | 20210901082917.399953-1-o451686892@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] mm/early_ioremap.c: remove redundant early_ioremap_shutdown() | expand |
On 01.09.21 10:29, Weizhao Ouyang wrote: > early_ioremap_reset() reserved a weak function so that architectures can > provide a specific cleanup. Now no architectures use it, remove this > redundant function. > > Signed-off-by: Weizhao Ouyang <o451686892@gmail.com> > --- > include/asm-generic/early_ioremap.h | 6 ------ > mm/early_ioremap.c | 5 ----- > 2 files changed, 11 deletions(-) > > diff --git a/include/asm-generic/early_ioremap.h b/include/asm-generic/early_ioremap.h > index 9def22e6e2b3..9d0479f50f97 100644 > --- a/include/asm-generic/early_ioremap.h > +++ b/include/asm-generic/early_ioremap.h > @@ -19,12 +19,6 @@ extern void *early_memremap_prot(resource_size_t phys_addr, > extern void early_iounmap(void __iomem *addr, unsigned long size); > extern void early_memunmap(void *addr, unsigned long size); > > -/* > - * Weak function called by early_ioremap_reset(). It does nothing, but > - * architectures may provide their own version to do any needed cleanups. > - */ > -extern void early_ioremap_shutdown(void); > - > #if defined(CONFIG_GENERIC_EARLY_IOREMAP) && defined(CONFIG_MMU) > /* Arch-specific initialization */ > extern void early_ioremap_init(void); > diff --git a/mm/early_ioremap.c b/mm/early_ioremap.c > index 164607c7cdf1..74984c23a87e 100644 > --- a/mm/early_ioremap.c > +++ b/mm/early_ioremap.c > @@ -38,13 +38,8 @@ pgprot_t __init __weak early_memremap_pgprot_adjust(resource_size_t phys_addr, > return prot; > } > > -void __init __weak early_ioremap_shutdown(void) > -{ > -} > - > void __init early_ioremap_reset(void) > { > - early_ioremap_shutdown(); > after_paging_init = 1; > } > > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/include/asm-generic/early_ioremap.h b/include/asm-generic/early_ioremap.h index 9def22e6e2b3..9d0479f50f97 100644 --- a/include/asm-generic/early_ioremap.h +++ b/include/asm-generic/early_ioremap.h @@ -19,12 +19,6 @@ extern void *early_memremap_prot(resource_size_t phys_addr, extern void early_iounmap(void __iomem *addr, unsigned long size); extern void early_memunmap(void *addr, unsigned long size); -/* - * Weak function called by early_ioremap_reset(). It does nothing, but - * architectures may provide their own version to do any needed cleanups. - */ -extern void early_ioremap_shutdown(void); - #if defined(CONFIG_GENERIC_EARLY_IOREMAP) && defined(CONFIG_MMU) /* Arch-specific initialization */ extern void early_ioremap_init(void); diff --git a/mm/early_ioremap.c b/mm/early_ioremap.c index 164607c7cdf1..74984c23a87e 100644 --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -38,13 +38,8 @@ pgprot_t __init __weak early_memremap_pgprot_adjust(resource_size_t phys_addr, return prot; } -void __init __weak early_ioremap_shutdown(void) -{ -} - void __init early_ioremap_reset(void) { - early_ioremap_shutdown(); after_paging_init = 1; }
early_ioremap_reset() reserved a weak function so that architectures can provide a specific cleanup. Now no architectures use it, remove this redundant function. Signed-off-by: Weizhao Ouyang <o451686892@gmail.com> --- include/asm-generic/early_ioremap.h | 6 ------ mm/early_ioremap.c | 5 ----- 2 files changed, 11 deletions(-)