diff options
| author |  Vincent Whitchurch <vincent.whitchurch@axis.com>
| 2019-02-22 16:30:49 +0100 |
|---|---|---|
| committer |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2019-02-26 12:54:55 +0100 |
| commit | fbc63864fa13aea0ea2a0753aa76d4897f3bc30f (patch) | |
| tree | b20eef9f47f765bfb2a9dc906ed46d26438b18b0 /drivers/misc/mic/card/mic_device.c | |
| parent | mic: vop: Cast pointers to unsigned long (diff) | |
| download | linux-fbc63864fa13aea0ea2a0753aa76d4897f3bc30f.tar.gz linux-fbc63864fa13aea0ea2a0753aa76d4897f3bc30f.tar.bz2 linux-fbc63864fa13aea0ea2a0753aa76d4897f3bc30f.zip | |
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>
Diffstat (limited to 'drivers/misc/mic/card/mic_device.c')
| -rw-r--r-- | drivers/misc/mic/card/mic_device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/mic/card/mic_device.c b/drivers/misc/mic/card/mic_device.c index e749af48f736..dcd07ef29801 100644 --- a/drivers/misc/mic/card/mic_device.c +++ b/drivers/misc/mic/card/mic_device.c @@ -245,8 +245,8 @@ static struct scif_hw_ops scif_hw_ops = { .next_db = ___mic_next_db, .send_intr = ___mic_send_intr, .send_p2p_intr = ___mic_send_p2p_intr, - .ioremap = ___mic_ioremap, - .iounmap = ___mic_iounmap, + .remap = ___mic_ioremap, + .unmap = ___mic_iounmap, }; static inline struct mic_driver *vpdev_to_mdrv(struct vop_device *vpdev) @@ -316,8 +316,8 @@ static struct vop_hw_ops vop_hw_ops = { .next_db = __mic_next_db, .get_remote_dp = __mic_get_remote_dp, .send_intr = __mic_send_intr, - .ioremap = __mic_ioremap, - .iounmap = __mic_iounmap, + .remap = __mic_ioremap, + .unmap = __mic_iounmap, }; static int mic_request_dma_chans(struct mic_driver *mdrv) |