Commit 78857614 authored Jun 17, 2013 by Markos Chandras Committed by Ralf Baechle Jul 01, 2013

MIPS: Expose missing pci_io{map,unmap} declarations



The GENERIC_PCI_IOMAP does not depend on CONFIG_PCI so move
it to the CONFIG_MIPS symbol so it's always selected for MIPS.
This fixes the missing pci_iomap declaration for MIPS.
Moreover, the pci_iounmap function was not defined in the
io.h header file if the CONFIG_PCI symbol is not set,
but it should since MIPS is not using CONFIG_GENERIC_IOMAP.

This fixes the following problem on a allyesconfig:

drivers/net/ethernet/3com/3c59x.c:1031:2: error: implicit declaration of
function 'pci_iomap' [-Werror=implicit-function-declaration]
drivers/net/ethernet/3com/3c59x.c:1044:3: error: implicit declaration of
function 'pci_iounmap' [-Werror=implicit-function-declaration]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5478/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 78276207

arch/mips/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ config MIPS
		select HAVE_GENERIC_HARDIRQS
		select GENERIC_IRQ_PROBE
		select GENERIC_IRQ_SHOW
		select GENERIC_PCI_IOMAP
		select HAVE_ARCH_JUMP_LABEL
		select ARCH_WANT_IPC_PARSE_VERSION
		select IRQ_FORCED_THREADING
		@@ -2391,7 +2392,6 @@ config PCI
		bool "Support for PCI controller"
		depends on HW_HAS_PCI
		select PCI_DOMAINS
		select GENERIC_PCI_IOMAP
		select NO_GENERIC_PCI_IOPORT_MAP
		help
		Find out whether you have a PCI motherboard. PCI is the name of a

arch/mips/include/asm/io.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,11 @@ static inline void * isa_bus_to_virt(unsigned long address)
		extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags);
		extern void __iounmap(const volatile void __iomem *addr);

		#ifndef CONFIG_PCI
		struct pci_dev;
		static inline void pci_iounmap(struct pci_dev dev, void __iomem addr) {}
		#endif

		static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
		unsigned long flags)
		{

Admin message