Commit 68fdb644 authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

lib/logic_iomem: fix sparse warnings 



A couple of sparse warnings happened here due to casts on
the prints, a missing static and a missing include. Fix
all of them.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Fixes: ca2e3342 ("lib: add iomem emulation (logic_iomem)")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-By: default avatarAnton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent b76dd930

lib/logic_iomem.c

+9 −7
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/types.h>

#include <linux/slab.h>

#include <linux/logic_iomem.h>

#include <asm/io.h>



struct logic_iomem_region {

	const struct resource *res;
@@ -78,7 +79,7 @@ static void __iomem *real_ioremap(phys_addr_t offset, size_t size) 
static void real_iounmap(void __iomem *addr)

{

	WARN(1, "invalid iounmap for addr 0x%llx\n",

	     (unsigned long long)addr);

	     (unsigned long long __force)addr);

}

#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */
@@ -172,14 +173,15 @@ EXPORT_SYMBOL(iounmap); 
static u##sz real_raw_read ## op(const volatile void __iomem *addr)	\

{									\

	WARN(1, "Invalid read" #op " at address %llx\n",		\

	     (unsigned long long)addr);					\

	     (unsigned long long __force)addr);				\

	return (u ## sz)~0ULL;						\

}									\

									\

void real_raw_write ## op(u ## sz val, volatile void __iomem *addr)	\

static void real_raw_write ## op(u ## sz val,				\

				 volatile void __iomem *addr)		\

{									\

	WARN(1, "Invalid writeq" #op " of 0x%llx at address %llx\n",	\

	     (unsigned long long)val, (unsigned long long)addr);	\

	     (unsigned long long)val, (unsigned long long __force)addr);\

}									\



MAKE_FALLBACK(b, 8);
@@ -192,14 +194,14 @@ MAKE_FALLBACK(q, 64); 
static void real_memset_io(volatile void __iomem *addr, int value, size_t size)

{

	WARN(1, "Invalid memset_io at address 0x%llx\n",

	     (unsigned long long)addr);

	     (unsigned long long __force)addr);

}



static void real_memcpy_fromio(void *buffer, const volatile void __iomem *addr,

			       size_t size)

{

	WARN(1, "Invalid memcpy_fromio at address 0x%llx\n",

	     (unsigned long long)addr);

	     (unsigned long long __force)addr);



	memset(buffer, 0xff, size);

}
@@ -208,7 +210,7 @@ static void real_memcpy_toio(volatile void __iomem *addr, const void *buffer, 
			     size_t size)

{

	WARN(1, "Invalid memcpy_toio at address 0x%llx\n",

	     (unsigned long long)addr);

	     (unsigned long long __force)addr);

}

#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */