| From 90b24cbaf59ab5cbe5441f20b9154b170cc47317 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 Jan 2022 16:40:15 +0100 |
| Subject: lib/logic_iomem: correct fallback config references |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| [ Upstream commit 2a6852cb8ff0c8c1363cac648d68489343813212 ] |
| |
| Due to some renaming, we ended up with the "indirect iomem" |
| naming in Kconfig, following INDIRECT_PIO. However, clearly |
| I missed following through on that in the ifdefs, but so far |
| INDIRECT_IOMEM_FALLBACK isn't used by any architecture. |
| |
| Reported-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> |
| Fixes: ca2e334232b6 ("lib: add iomem emulation (logic_iomem)") |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| lib/logic_iomem.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/lib/logic_iomem.c b/lib/logic_iomem.c |
| index 549b22d4bcde..e7ea9b28d8db 100644 |
| --- a/lib/logic_iomem.c |
| +++ b/lib/logic_iomem.c |
| @@ -68,7 +68,7 @@ int logic_iomem_add_region(struct resource *resource, |
| } |
| EXPORT_SYMBOL(logic_iomem_add_region); |
| |
| -#ifndef CONFIG_LOGIC_IOMEM_FALLBACK |
| +#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK |
| static void __iomem *real_ioremap(phys_addr_t offset, size_t size) |
| { |
| WARN(1, "invalid ioremap(0x%llx, 0x%zx)\n", |
| @@ -81,7 +81,7 @@ static void real_iounmap(void __iomem *addr) |
| WARN(1, "invalid iounmap for addr 0x%llx\n", |
| (unsigned long long)(uintptr_t __force)addr); |
| } |
| -#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */ |
| +#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */ |
| |
| void __iomem *ioremap(phys_addr_t offset, size_t size) |
| { |
| @@ -168,7 +168,7 @@ void iounmap(void __iomem *addr) |
| } |
| EXPORT_SYMBOL(iounmap); |
| |
| -#ifndef CONFIG_LOGIC_IOMEM_FALLBACK |
| +#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK |
| #define MAKE_FALLBACK(op, sz) \ |
| static u##sz real_raw_read ## op(const volatile void __iomem *addr) \ |
| { \ |
| @@ -213,7 +213,7 @@ static void real_memcpy_toio(volatile void __iomem *addr, const void *buffer, |
| WARN(1, "Invalid memcpy_toio at address 0x%llx\n", |
| (unsigned long long)(uintptr_t __force)addr); |
| } |
| -#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */ |
| +#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */ |
| |
| #define MAKE_OP(op, sz) \ |
| u##sz __raw_read ## op(const volatile void __iomem *addr) \ |
| -- |
| 2.35.1 |
| |