Commit 82ed223c authored by Jonas Bonn's avatar Jonas Bonn
Browse files

iomap: make IOPORT/PCI mapping functions conditional 



Use the CONFIG_HAS_IOPORT and CONFIG_PCI options to decide whether or
not functions for mapping these areas are provided.

Signed-off-by: default avatarJonas Bonn <jonas@southpole.se>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f1ecc698

include/asm-generic/io.h

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ static inline void iounmap(void *addr) 
}

#endif /* CONFIG_MMU */



#ifdef CONFIG_HAS_IOPORT

#ifndef CONFIG_GENERIC_IOMAP

static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)

{
@@ -345,6 +346,7 @@ static inline void ioport_unmap(void __iomem *p) 
extern void __iomem *ioport_map(unsigned long port, unsigned int nr);

extern void ioport_unmap(void __iomem *p);

#endif /* CONFIG_GENERIC_IOMAP */

#endif /* CONFIG_HAS_IOPORT */



#define xlate_dev_kmem_ptr(p)	p

#define xlate_dev_mem_ptr(p)	__va(p)

include/asm-generic/iomap.h

+4 −0
Original line number Diff line number Diff line
@@ -56,17 +56,21 @@ extern void iowrite8_rep(void __iomem *port, const void *buf, unsigned long coun 
extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count);

extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count);



#ifdef CONFIG_HAS_IOPORT

/* Create a virtual mapping cookie for an IO port range */

extern void __iomem *ioport_map(unsigned long port, unsigned int nr);

extern void ioport_unmap(void __iomem *);

#endif



#ifndef ARCH_HAS_IOREMAP_WC

#define ioremap_wc ioremap_nocache

#endif



#ifdef CONFIG_PCI

/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */

struct pci_dev;

extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);

extern void pci_iounmap(struct pci_dev *dev, void __iomem *);

#endif



#endif

lib/iomap.c

+4 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ EXPORT_SYMBOL(iowrite8_rep); 
EXPORT_SYMBOL(iowrite16_rep);

EXPORT_SYMBOL(iowrite32_rep);



#ifdef CONFIG_HAS_IOPORT

/* Create a virtual mapping cookie for an IO port range */

void __iomem *ioport_map(unsigned long port, unsigned int nr)

{
@@ -238,7 +239,9 @@ void ioport_unmap(void __iomem *addr) 
}

EXPORT_SYMBOL(ioport_map);

EXPORT_SYMBOL(ioport_unmap);

#endif /* CONFIG_HAS_IOPORT */



#ifdef CONFIG_PCI

/**

 * pci_iomap - create a virtual mapping cookie for a PCI BAR

 * @dev: PCI device that owns the BAR
@@ -280,3 +283,4 @@ void pci_iounmap(struct pci_dev *dev, void __iomem * addr) 
}

EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);

#endif /* CONFIG_PCI */