Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbc63864 authored by Vincent Whitchurch's avatar Vincent Whitchurch Committed by Greg Kroah-Hartman
Browse files

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: default avatarVincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba01cea2

drivers/misc/mic/bus/scif_bus.h

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/misc/mic/bus/vop_bus.h

+4 −4
Original line number Diff line number Diff line
@@ -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 *

drivers/misc/mic/card/mic_device.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

drivers/misc/mic/host/mic_boot.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

drivers/misc/mic/scif/scif_map.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

}