ARM: ixp4xx: fix ioport_unmap definition
An empty macro definition can cause unexpected behavior, in case of the ixp4xx ioport_unmap, we get two warnings: drivers/net/wireless/marvell/libertas/if_cs.c: In function 'if_cs_release': drivers/net/wireless/marvell/libertas/if_cs.c:826:3: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] ioport_unmap(card->iobase); drivers/vfio/pci/vfio_pci_rdwr.c: In function 'vfio_pci_vga_rw': drivers/vfio/pci/vfio_pci_rdwr.c:230:15: error: the omitted middle operand in ?: will always be 'true', suggest explicit middle operand [-Werror=parentheses] is_ioport ? ioport_unmap(iomem) : iounmap(iomem); This uses an inline function to define the macro in a safer way. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Krzysztof Halasa <khalasa@piap.pl>
This commit is contained in:
parent
cd5bad4135
commit
c4caa8db4c
1 changed files with 9 additions and 2 deletions
|
@ -534,8 +534,15 @@ static inline void iowrite32_rep(void __iomem *addr, const void *vaddr,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ioport_map(port, nr) ((void __iomem*)(port + PIO_OFFSET))
|
#define ioport_map(port, nr) ioport_map(port, nr)
|
||||||
#define ioport_unmap(addr)
|
static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
|
||||||
|
{
|
||||||
|
return ((void __iomem*)((port) + PIO_OFFSET));
|
||||||
|
}
|
||||||
|
#define ioport_unmap(addr) ioport_unmap(addr)
|
||||||
|
static inline void ioport_unmap(void __iomem *addr)
|
||||||
|
{
|
||||||
|
}
|
||||||
#endif /* CONFIG_PCI */
|
#endif /* CONFIG_PCI */
|
||||||
|
|
||||||
#endif /* __ASM_ARM_ARCH_IO_H */
|
#endif /* __ASM_ARM_ARCH_IO_H */
|
||||||
|
|
Loading…
Reference in a new issue