mic: Rename ioremap pointer to remap
authorVincent Whitchurch <vincent.whitchurch@axis.com>
Fri, 22 Feb 2019 15:30:49 +0000 (16:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Feb 2019 11:54:55 +0000 (12:54 +0100)
commitfbc63864fa13aea0ea2a0753aa76d4897f3bc30f
treeb20eef9f47f765bfb2a9dc906ed46d26438b18b0
parentba01cea2be8872591452e84acebede388c91249b
mic: Rename ioremap pointer to remap

Some architectures (like MIPS) implement ioremap as a macro, and this
leads to conflicts with the ioremap function pointer in various mic
structures.

 drivers/misc/mic/vop/vop_vringh.c:
   In function 'vop_virtio_init_post':
 drivers/misc/mic/vop/vop_vringh.c:86:13:
   error: macro "ioremap" passed 3 arguments, but takes just 2

Rename ioremap to remap to fix this.  Likewise for iounmap.

Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mic/bus/scif_bus.h
drivers/misc/mic/bus/vop_bus.h
drivers/misc/mic/card/mic_device.c
drivers/misc/mic/host/mic_boot.c
drivers/misc/mic/scif/scif_map.h
drivers/misc/mic/vop/vop_main.c
drivers/misc/mic/vop/vop_vringh.c