Commit 2a6852cb authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

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: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Fixes: ca2e3342 ("lib: add iomem emulation (logic_iomem)")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 3bdd271b

lib/logic_iomem.c

+4 −4
Original line number Diff line number Diff line
@@ -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(volatile 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(volatile 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)		\