drm/vmwgfx: Kill a bunch of sparse warnings

We're giving up all attempts to keep cpu- and device byte ordering separate.

This silences sparse when compiled using
make C=2 CF="-D__CHECK_ENDIAN__"

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>

1 files changed, 18 insertions, 19 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index 9b8b09f8135b..7a6cf1700745 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -31,7 +31,7 @@
 
 bool vmw_fifo_have_3d(struct vmw_private *dev_priv)
 {
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
         uint32_t fifo_min, hwversion;
         const struct vmw_fifo_state *fifo = &dev_priv->fifo;
 
@@ -80,7 +80,7 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv)
 
 bool vmw_fifo_have_pitchlock(struct vmw_private *dev_priv)
 {
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
         uint32_t caps;
 
         if (!(dev_priv->capabilities & SVGA_CAP_EXTENDED_FIFO))
@@ -95,7 +95,7 @@ bool vmw_fifo_have_pitchlock(struct vmw_private *dev_priv)
 
 int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
 {
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
         uint32_t max;
         uint32_t min;
 
@@ -158,7 +158,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
 
 void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason)
 {
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
         static DEFINE_SPINLOCK(ping_lock);
         unsigned long irq_flags;
 
@@ -176,7 +176,7 @@ void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason)
 
 void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
 {
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
 
         vmw_write(dev_priv, SVGA_REG_SYNC, SVGA_SYNC_GENERIC);
         while (vmw_read(dev_priv, SVGA_REG_BUSY) != 0)
@@ -206,7 +206,7 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
 
 static bool vmw_fifo_is_full(struct vmw_private *dev_priv, uint32_t bytes)
 {
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
         uint32_t max = ioread32(fifo_mem + SVGA_FIFO_MAX);
         uint32_t next_cmd = ioread32(fifo_mem + SVGA_FIFO_NEXT_CMD);
         uint32_t min = ioread32(fifo_mem + SVGA_FIFO_MIN);
@@ -314,7 +314,7 @@ static void *vmw_local_fifo_reserve(struct vmw_private *dev_priv,
                                     uint32_t bytes)
 {
         struct vmw_fifo_state *fifo_state = &dev_priv->fifo;
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
         uint32_t max;
         uint32_t min;
         uint32_t next_cmd;
@@ -371,7 +371,8 @@ static void *vmw_local_fifo_reserve(struct vmw_private *dev_priv,
                                 if (reserveable)
                                         iowrite32(bytes, fifo_mem +
                                                   SVGA_FIFO_RESERVED);
-                                return fifo_mem + (next_cmd >> 2);
+                                return (void __force *) (fifo_mem +
+                                                         (next_cmd >> 2));
                         } else {
                                 need_bounce = true;
                         }
@@ -414,7 +415,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
 }
 
 static void vmw_fifo_res_copy(struct vmw_fifo_state *fifo_state,
-                              __le32 __iomem *fifo_mem,
+                              u32 __iomem *fifo_mem,
                               uint32_t next_cmd,
                               uint32_t max, uint32_t min, uint32_t bytes)
 {
@@ -436,7 +437,7 @@ static void vmw_fifo_res_copy(struct vmw_fifo_state *fifo_state,
 }
 
 static void vmw_fifo_slow_copy(struct vmw_fifo_state *fifo_state,
-                               __le32 __iomem *fifo_mem,
+                               u32 __iomem *fifo_mem,
                                uint32_t next_cmd,
                                uint32_t max, uint32_t min, uint32_t bytes)
 {
@@ -455,10 +456,10 @@ static void vmw_fifo_slow_copy(struct vmw_fifo_state *fifo_state,
         }
 }
 
-void vmw_local_fifo_commit(struct vmw_private *dev_priv, uint32_t bytes)
+static void vmw_local_fifo_commit(struct vmw_private *dev_priv, uint32_t bytes)
 {
         struct vmw_fifo_state *fifo_state = &dev_priv->fifo;
-        __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        u32 __iomem *fifo_mem = dev_priv->mmio_virt;
         uint32_t next_cmd = ioread32(fifo_mem + SVGA_FIFO_NEXT_CMD);
         uint32_t max = ioread32(fifo_mem + SVGA_FIFO_MAX);
         uint32_t min = ioread32(fifo_mem + SVGA_FIFO_MIN);
@@ -545,9 +546,9 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
 {
         struct vmw_fifo_state *fifo_state = &dev_priv->fifo;
         struct svga_fifo_cmd_fence *cmd_fence;
-        void *fm;
+        u32 *fm;
         int ret = 0;
-        uint32_t bytes = sizeof(__le32) + sizeof(*cmd_fence);
+        uint32_t bytes = sizeof(u32) + sizeof(*cmd_fence);
 
         fm = vmw_fifo_reserve(dev_priv, bytes);
         if (unlikely(fm == NULL)) {
@@ -573,11 +574,9 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
                 return 0;
         }
 
-        *(__le32 *) fm = cpu_to_le32(SVGA_CMD_FENCE);
-        cmd_fence = (struct svga_fifo_cmd_fence *)
-            ((unsigned long)fm + sizeof(__le32));
-
-        iowrite32(*seqno, &cmd_fence->fence);
+        *fm++ = SVGA_CMD_FENCE;
+        cmd_fence = (struct svga_fifo_cmd_fence *) fm;
+        cmd_fence->fence = *seqno;
         vmw_fifo_commit_flush(dev_priv, bytes);
         (void) vmw_marker_push(&fifo_state->marker_queue, *seqno);
         vmw_update_seqno(dev_priv, fifo_state);