diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2023-08-11 09:01:17 +0200 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2023-08-11 22:27:02 +0200 |
| commit | 232ba1630c666b37a5045781e6513cba607fb0d5 (patch) | |
| tree | 4614c3c56be3a86e9c1538773c82ab8b310fde2a /arch/openrisc | |
| parent | Linux 6.5-rc5 (diff) | |
| download | linux-232ba1630c666b37a5045781e6513cba607fb0d5.tar.xz linux-232ba1630c666b37a5045781e6513cba607fb0d5.zip | |
openrisc: Make pfn accessors statics inlines
Making virt_to_pfn() a static inline taking a strongly typed
(const void *) makes the contract of a passing a pointer of that
type to the function explicit and exposes any misuse of the
macro virt_to_pfn() acting polymorphic and accepting many types
such as (void *), (unitptr_t) or (unsigned long) as arguments
without warnings.
For symmetry, do the same with pfn_to_virt().
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/include/asm/page.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h index 52b0d7e76446..44fc1fd56717 100644 --- a/arch/openrisc/include/asm/page.h +++ b/arch/openrisc/include/asm/page.h @@ -72,8 +72,15 @@ typedef struct page *pgtable_t; #define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET)) #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) -#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) -#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) +static inline unsigned long virt_to_pfn(const void *kaddr) +{ + return __pa(kaddr) >> PAGE_SHIFT; +} + +static inline void * pfn_to_virt(unsigned long pfn) +{ + return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT); +} #define virt_to_page(addr) \ (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)) |