[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230921110424.215592-5-bhe@redhat.com>
Date: Thu, 21 Sep 2023 19:04:24 +0800
From: Baoquan He <bhe@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: linux-arch@...r.kernel.org, linux-mm@...ck.org,
akpm@...ux-foundation.org, arnd@...db.de, jiaxun.yang@...goat.com,
mpe@...erman.id.au, geert@...ux-m68k.org, mcgrof@...nel.org,
hch@...radead.org, tsbogend@...ha.franken.de, f.fainelli@...il.com,
deller@....de, Baoquan He <bhe@...hat.com>,
Serge Semin <fancer.lancer@...il.com>,
Huacai Chen <chenhuacai@...nel.org>, linux-mips@...r.kernel.org
Subject: [PATCH v5 4/4] mips: io: remove duplicated codes
By adding <asm-generic/io.h> support, the duplicated phys_to_virt
can be removed to use the default version in <asm-gneneric/io.h>.
Meanwhile move isa_bus_to_virt() down below <asm-generic/io.h> including
to fix the compiling error of missing phys_to_virt definition.
Signed-off-by: Baoquan He <bhe@...hat.com>
Cc: Thomas Bogendoerfer <tsbogend@...ha.franken.de>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: Helge Deller <deller@....de>
Cc: Serge Semin <fancer.lancer@...il.com>
Cc: Florian Fainelli <f.fainelli@...il.com>
Cc: Huacai Chen <chenhuacai@...nel.org>
Cc: Jiaxun Yang <jiaxun.yang@...goat.com>
Cc: linux-mips@...r.kernel.org
---
arch/mips/include/asm/io.h | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 1ecf255efb40..fe5476c1c689 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -117,24 +117,6 @@ static inline phys_addr_t virt_to_phys(const volatile void *x)
return __virt_to_phys(x);
}
-/*
- * phys_to_virt - map physical address to virtual
- * @address: address to remap
- *
- * The returned virtual address is a current CPU mapping for
- * the memory address given. It is only valid to use this function on
- * addresses that have a kernel mapping
- *
- * This function does not handle bus mappings for DMA transfers. In
- * almost all conceivable cases a device driver should not be using
- * this function
- */
-#define phys_to_virt phys_to_virt
-static inline void * phys_to_virt(unsigned long address)
-{
- return __va(address);
-}
-
/*
* ISA I/O bus memory addresses are 1:1 with the physical address.
*/
@@ -143,11 +125,6 @@ static inline unsigned long isa_virt_to_bus(volatile void *address)
return virt_to_phys(address);
}
-static inline void *isa_bus_to_virt(unsigned long address)
-{
- return phys_to_virt(address);
-}
-
/*
* Change "struct page" to physical address.
*/
@@ -596,4 +573,9 @@ void __ioread64_copy(void *to, const void __iomem *from, size_t count);
#include <asm-generic/io.h>
+static inline void *isa_bus_to_virt(unsigned long address)
+{
+ return phys_to_virt(address);
+}
+
#endif /* _ASM_IO_H */
--
2.41.0
Powered by blists - more mailing lists