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>

diff --git a/drivers/misc/mic/bus/scif_bus.h b/drivers/misc/mic/bus/scif_bus.h
index ff59568219adbf637c227ae2be657864ef8e3853..377a4f38cd7e1a4a26ae0489d6763c71e8e81a2a 100644 (file)
--- a/drivers/misc/mic/bus/scif_bus.h
+++ b/drivers/misc/mic/bus/scif_bus.h
@@ -88,8 +88,8 @@ struct scif_driver {
  * @send_intr: Send an interrupt to the remote node on a specified doorbell.
  * @send_p2p_intr: Send an interrupt to the peer node on a specified doorbell
  * which is specifically targeted for a peer to peer node.
- * @ioremap: Map a buffer with the specified physical address and length.
- * @iounmap: Unmap a buffer previously mapped.
+ * @remap: Map a buffer with the specified physical address and length.
+ * @unmap: Unmap a buffer previously mapped.
  */
 struct scif_hw_ops {
        int (*next_db)(struct scif_hw_dev *sdev);
@@ -104,9 +104,9 @@ struct scif_hw_ops {
        void (*send_intr)(struct scif_hw_dev *sdev, int db);
        void (*send_p2p_intr)(struct scif_hw_dev *sdev, int db,
                              struct mic_mw *mw);
-       void __iomem * (*ioremap)(struct scif_hw_dev *sdev,
+       void __iomem * (*remap)(struct scif_hw_dev *sdev,
                                  phys_addr_t pa, size_t len);
-       void (*iounmap)(struct scif_hw_dev *sdev, void __iomem *va);
+       void (*unmap)(struct scif_hw_dev *sdev, void __iomem *va);
 };
 
 int scif_register_driver(struct scif_driver *driver);

diff --git a/drivers/misc/mic/bus/vop_bus.h b/drivers/misc/mic/bus/vop_bus.h
index fff7a865d72120bac788e705c657b40f3be226e9..cf5f3fae573cd75017371756a3282b925198dda9 100644 (file)
--- a/drivers/misc/mic/bus/vop_bus.h
+++ b/drivers/misc/mic/bus/vop_bus.h
@@ -87,8 +87,8 @@ struct vop_driver {
  * @get_dp: Get access to the virtio device page used by the self
  *          node to add/remove/configure virtio devices.
  * @send_intr: Send an interrupt to the peer node on a specified doorbell.
- * @ioremap: Map a buffer with the specified DMA address and length.
- * @iounmap: Unmap a buffer previously mapped.
+ * @remap: Map a buffer with the specified DMA address and length.
+ * @unmap: Unmap a buffer previously mapped.
  * @dma_filter: The DMA filter function to use for obtaining access to
  *             a DMA channel on the peer node.
  */
@@ -104,9 +104,9 @@ struct vop_hw_ops {
        void __iomem * (*get_remote_dp)(struct vop_device *vpdev);
        void * (*get_dp)(struct vop_device *vpdev);
        void (*send_intr)(struct vop_device *vpdev, int db);
-       void __iomem * (*ioremap)(struct vop_device *vpdev,
+       void __iomem * (*remap)(struct vop_device *vpdev,
                                  dma_addr_t pa, size_t len);
-       void (*iounmap)(struct vop_device *vpdev, void __iomem *va);
+       void (*unmap)(struct vop_device *vpdev, void __iomem *va);
 };
 
 struct vop_device *

diff --git a/drivers/misc/mic/card/mic_device.c b/drivers/misc/mic/card/mic_device.c
index e749af48f7369ddab489fe55193452a1abe15961..dcd07ef298017c23d06185a629a50254129eaeea 100644 (file)
--- 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)

diff --git a/drivers/misc/mic/host/mic_boot.c b/drivers/misc/mic/host/mic_boot.c
index 6479435ac96bfd59768247c0928475c16a445961..079c36f0ce6e282d2cdbe5b2e40fe8227e533a9e 100644 (file)
--- a/drivers/misc/mic/host/mic_boot.c
+++ b/drivers/misc/mic/host/mic_boot.c
@@ -133,8 +133,8 @@ static struct vop_hw_ops vop_hw_ops = {
        .get_dp = __mic_get_dp,
        .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 inline struct mic_device *scdev_to_mdev(struct scif_hw_dev *scdev)
@@ -315,8 +315,8 @@ static struct scif_hw_ops scif_hw_ops = {
        .ack_interrupt = ___mic_ack_interrupt,
        .next_db = ___mic_next_db,
        .send_intr = ___mic_send_intr,
-       .ioremap = ___mic_ioremap,
-       .iounmap = ___mic_iounmap,
+       .remap = ___mic_ioremap,
+       .unmap = ___mic_iounmap,
 };
 
 static inline struct mic_device *mbdev_to_mdev(struct mbus_device *mbdev)

diff --git a/drivers/misc/mic/scif/scif_map.h b/drivers/misc/mic/scif/scif_map.h
index 3e86360ba5a6b07287abea9b05092442d7b1162a..7b380534eba1df7bf2d3b7e02eb800c51851e7f2 100644 (file)
--- a/drivers/misc/mic/scif/scif_map.h
+++ b/drivers/misc/mic/scif/scif_map.h
@@ -97,7 +97,7 @@ scif_ioremap(dma_addr_t phys, size_t size, struct scif_dev *scifdev)
                out_virt = phys_to_virt(phys);
        else
                out_virt = (void __force *)
-                          sdev->hw_ops->ioremap(sdev, phys, size);
+                          sdev->hw_ops->remap(sdev, phys, size);
        return out_virt;
 }
 
@@ -107,7 +107,7 @@ scif_iounmap(void *virt, size_t len, struct scif_dev *scifdev)
        if (!scifdev_self(scifdev)) {
                struct scif_hw_dev *sdev = scifdev->sdev;
 
-               sdev->hw_ops->iounmap(sdev, (void __force __iomem *)virt);
+               sdev->hw_ops->unmap(sdev, (void __force __iomem *)virt);
        }
 }
 

diff --git a/drivers/misc/mic/vop/vop_main.c b/drivers/misc/mic/vop/vop_main.c
index 263e0c3fa7c6620cf4dbc87074c09947ea7e2d42..e37b2c2152a2bf6b1931f4d33d83a2717ef79a03 100644 (file)
--- a/drivers/misc/mic/vop/vop_main.c
+++ b/drivers/misc/mic/vop/vop_main.c
@@ -270,7 +270,7 @@ static void vop_del_vq(struct virtqueue *vq, int n)
        free_pages((unsigned long)vdev->used_virt[n],
                   get_order(vdev->used_size[n]));
        vring_del_virtqueue(vq);
-       vpdev->hw_ops->iounmap(vpdev, vdev->vr[n]);
+       vpdev->hw_ops->unmap(vpdev, vdev->vr[n]);
        vdev->vr[n] = NULL;
 }
 
@@ -338,8 +338,7 @@ static struct virtqueue *vop_find_vq(struct virtio_device *dev,
        memcpy_fromio(&config, vqconfig, sizeof(config));
        _vr_size = vring_size(le16_to_cpu(config.num), MIC_VIRTIO_RING_ALIGN);
        vr_size = PAGE_ALIGN(_vr_size + sizeof(struct _mic_vring_info));
-       va = vpdev->hw_ops->ioremap(vpdev, le64_to_cpu(config.address),
-                       vr_size);
+       va = vpdev->hw_ops->remap(vpdev, le64_to_cpu(config.address), vr_size);
        if (!va)
                return ERR_PTR(-ENOMEM);
        vdev->vr[index] = va;
@@ -393,7 +392,7 @@ free_used:
        free_pages((unsigned long)used,
                   get_order(vdev->used_size[index]));
 unmap:
-       vpdev->hw_ops->iounmap(vpdev, vdev->vr[index]);
+       vpdev->hw_ops->unmap(vpdev, vdev->vr[index]);
        return ERR_PTR(err);
 }
 

diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c
index 73d9fe6bc18d20823893ad3dc08ebace8c25d6a0..3632fce405908f70270e20c7ae657fcff0d61018 100644 (file)
--- a/drivers/misc/mic/vop/vop_vringh.c
+++ b/drivers/misc/mic/vop/vop_vringh.c
@@ -80,7 +80,7 @@ static void vop_virtio_init_post(struct vop_vdev *vdev)
                        continue;
                }
                vdev->vvr[i].vrh.vring.used =
-                       (void __force *)vpdev->hw_ops->ioremap(
+                       (void __force *)vpdev->hw_ops->remap(
                        vpdev,
                        le64_to_cpu(vqconfig[i].used_address),
                        used_size);
@@ -528,7 +528,7 @@ static int vop_virtio_copy_to_user(struct vop_vdev *vdev, void __user *ubuf,
                                   int vr_idx)
 {
        struct vop_device *vpdev = vdev->vpdev;
-       void __iomem *dbuf = vpdev->hw_ops->ioremap(vpdev, daddr, len);
+       void __iomem *dbuf = vpdev->hw_ops->remap(vpdev, daddr, len);
        struct vop_vringh *vvr = &vdev->vvr[vr_idx];
        struct vop_info *vi = dev_get_drvdata(&vpdev->dev);
        size_t dma_alignment;
@@ -588,7 +588,7 @@ static int vop_virtio_copy_to_user(struct vop_vdev *vdev, void __user *ubuf,
        }
        err = 0;
 err:
-       vpdev->hw_ops->iounmap(vpdev, dbuf);
+       vpdev->hw_ops->unmap(vpdev, dbuf);
        dev_dbg(vop_dev(vdev),
                "%s: ubuf %p dbuf %p len 0x%zx vr_idx 0x%x\n",
                __func__, ubuf, dbuf, len, vr_idx);
@@ -606,7 +606,7 @@ static int vop_virtio_copy_from_user(struct vop_vdev *vdev, void __user *ubuf,
                                     int vr_idx)
 {
        struct vop_device *vpdev = vdev->vpdev;
-       void __iomem *dbuf = vpdev->hw_ops->ioremap(vpdev, daddr, len);
+       void __iomem *dbuf = vpdev->hw_ops->remap(vpdev, daddr, len);
        struct vop_vringh *vvr = &vdev->vvr[vr_idx];
        struct vop_info *vi = dev_get_drvdata(&vdev->vpdev->dev);
        size_t dma_alignment;
@@ -676,7 +676,7 @@ memcpy:
        vdev->out_bytes += len;
        err = 0;
 err:
-       vpdev->hw_ops->iounmap(vpdev, dbuf);
+       vpdev->hw_ops->unmap(vpdev, dbuf);
        dev_dbg(vop_dev(vdev),
                "%s: ubuf %p dbuf %p len 0x%zx vr_idx 0x%x\n",
                __func__, ubuf, dbuf, len, vr_idx);