From: Florian Fainelli <f.fainelli@gmail.com>
Date: Thu, 7 Jul 2022 20:37:42 +0000 (-0700)
Subject: MIPS: Make phys_to_virt utilize __va()
X-Git-Tag: v6.0-rc1~82^2~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9044576357b16d9ebbe10cc567277507d1165a54;p=users%2Fhch%2Fmisc.git

MIPS: Make phys_to_virt utilize __va()

The implementation is exactly the same, so avoid open-coding it in two
different locations.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 6f5c86d2bab4..880048a54362 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -131,7 +131,7 @@ static inline phys_addr_t virt_to_phys(const volatile void *x)
  */
 static inline void * phys_to_virt(unsigned long address)
 {
-	return (void *)(address + PAGE_OFFSET - PHYS_OFFSET);
+	return __va(address);
 }
 
 /*