Skip to content

Commit 2a6852c

Browse files
jmberg-intelrichardweinberger
authored andcommitted
lib/logic_iomem: correct fallback config references
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: ca2e334 ("lib: add iomem emulation (logic_iomem)") Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Richard Weinberger <richard@nod.at>
1 parent 3bdd271 commit 2a6852c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

lib/logic_iomem.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ int logic_iomem_add_region(struct resource *resource,
6868
}
6969
EXPORT_SYMBOL(logic_iomem_add_region);
7070

71-
#ifndef CONFIG_LOGIC_IOMEM_FALLBACK
71+
#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK
7272
static void __iomem *real_ioremap(phys_addr_t offset, size_t size)
7373
{
7474
WARN(1, "invalid ioremap(0x%llx, 0x%zx)\n",
@@ -81,7 +81,7 @@ static void real_iounmap(volatile void __iomem *addr)
8181
WARN(1, "invalid iounmap for addr 0x%llx\n",
8282
(unsigned long long)(uintptr_t __force)addr);
8383
}
84-
#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */
84+
#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */
8585

8686
void __iomem *ioremap(phys_addr_t offset, size_t size)
8787
{
@@ -168,7 +168,7 @@ void iounmap(volatile void __iomem *addr)
168168
}
169169
EXPORT_SYMBOL(iounmap);
170170

171-
#ifndef CONFIG_LOGIC_IOMEM_FALLBACK
171+
#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK
172172
#define MAKE_FALLBACK(op, sz) \
173173
static u##sz real_raw_read ## op(const volatile void __iomem *addr) \
174174
{ \
@@ -213,7 +213,7 @@ static void real_memcpy_toio(volatile void __iomem *addr, const void *buffer,
213213
WARN(1, "Invalid memcpy_toio at address 0x%llx\n",
214214
(unsigned long long)(uintptr_t __force)addr);
215215
}
216-
#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */
216+
#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */
217217

218218
#define MAKE_OP(op, sz) \
219219
u##sz __raw_read ## op(const volatile void __iomem *addr) \

0 commit comments

Comments
 (0)