openrisc: io: Fixup defines and move include to the end (045838bc) · Commits · 戴 / test

This didn't seem to cause any issues, but while working on fixing up sparse annotations for OpenRISC I noticed this. This patch moves the include of asm-generic/io.h to the end of the file. Also, we add defines of ioremap and iounmap, that way we don't get duplicate definitions from asm-generic/io.h. Signed-off-by:

Stafford Horne <shorne@gmail.com>

arch/openrisc/include/asm/io.h

+7 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		#ifndef __ASM_OPENRISC_IO_H
		#define __ASM_OPENRISC_IO_H

		#include <linux/types.h>

		/*
		* PCI: can we really do 0 here if we have no port IO?
		*/
		@@ -25,9 +27,12 @@
		#define PIO_OFFSET 0
		#define PIO_MASK 0

		#include <asm-generic/io.h>

		#define ioremap ioremap
		void __iomem *ioremap(phys_addr_t offset, unsigned long size);

		#define iounmap iounmap
		extern void iounmap(void *addr);

		#include <asm-generic/io.h>

		#endif

Admin message