mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-28 00:35:01 +00:00
mm: ioremap: remove unneeded ioremap_allowed and iounmap_allowed
Now there are no users of ioremap_allowed and iounmap_allowed, clean them up. Link: https://lkml.kernel.org/r/20230706154520.11257-20-bhe@redhat.com Signed-off-by: Baoquan He <bhe@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com> Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Brian Cain <bcain@quicinc.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Chris Zankel <chris@zankel.net> Cc: David Laight <David.Laight@ACULAB.COM> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Helge Deller <deller@gmx.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Jonas Bonn <jonas@southpole.se> Cc: Matthew Wilcox <willy@infradead.org> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Niklas Schnelle <schnelle@linux.ibm.com> Cc: Rich Felker <dalias@libc.org> Cc: Stafford Horne <shorne@gmail.com> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Vineet Gupta <vgupta@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
8f03d74f71
commit
95da27c4c6
@ -1047,32 +1047,6 @@ static inline void iounmap(volatile void __iomem *addr)
|
||||
#elif defined(CONFIG_GENERIC_IOREMAP)
|
||||
#include <linux/pgtable.h>
|
||||
|
||||
/*
|
||||
* Arch code can implement the following two hooks when using GENERIC_IOREMAP
|
||||
* ioremap_allowed() return a bool,
|
||||
* - true means continue to remap
|
||||
* - false means skip remap and return directly
|
||||
* iounmap_allowed() return a bool,
|
||||
* - true means continue to vunmap
|
||||
* - false means skip vunmap and return directly
|
||||
*/
|
||||
#ifndef ioremap_allowed
|
||||
#define ioremap_allowed ioremap_allowed
|
||||
static inline bool ioremap_allowed(phys_addr_t phys_addr, size_t size,
|
||||
unsigned long prot)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef iounmap_allowed
|
||||
#define iounmap_allowed iounmap_allowed
|
||||
static inline bool iounmap_allowed(void *addr)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
|
||||
pgprot_t prot);
|
||||
|
||||
|
@ -33,9 +33,6 @@ void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
|
||||
phys_addr -= offset;
|
||||
size = PAGE_ALIGN(size + offset);
|
||||
|
||||
if (!ioremap_allowed(phys_addr, size, pgprot_val(prot)))
|
||||
return NULL;
|
||||
|
||||
area = __get_vm_area_caller(size, VM_IOREMAP, IOREMAP_START,
|
||||
IOREMAP_END, __builtin_return_address(0));
|
||||
if (!area)
|
||||
@ -64,9 +61,6 @@ void generic_iounmap(volatile void __iomem *addr)
|
||||
{
|
||||
void *vaddr = (void *)((unsigned long)addr & PAGE_MASK);
|
||||
|
||||
if (!iounmap_allowed(vaddr))
|
||||
return;
|
||||
|
||||
if (is_ioremap_addr(vaddr))
|
||||
vunmap(vaddr);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user