[Nouveau] [PATCH] drm/nv50/evo: store iomem pointer in properly typed field

[Marcin Slusarz]

Abuse of function pointer was noticed by sparse.

Signed-off-by: Marcin Slusarz <marcin.slus...@gmail.com>
---
 drivers/gpu/drm/nouveau/nv50_evo.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c 
b/drivers/gpu/drm/nouveau/nv50_evo.c
index 9f6f55c..ba497fb 100644
--- a/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/drivers/gpu/drm/nouveau/nv50_evo.c
@@ -33,17 +33,22 @@
 #include <subdev/timer.h>
 #include <subdev/fb.h>
 
+struct evo_object {
+       struct nouveau_object parent;
+       void __iomem *iomem;
+};
+
 static u32
 nv50_evo_rd32(struct nouveau_object *object, u32 addr)
 {
-       void __iomem *iomem = object->oclass->ofuncs->rd08;
+       void __iomem *iomem = ((struct evo_object *)object)->iomem;
        return ioread32_native(iomem + addr);
 }
 
 static void
 nv50_evo_wr32(struct nouveau_object *object, u32 addr, u32 data)
 {
-       void __iomem *iomem = object->oclass->ofuncs->rd08;
+       void __iomem *iomem = ((struct evo_object *)object)->iomem;
        iowrite32_native(data, iomem + addr);
 }
 
@@ -60,7 +65,7 @@ nv50_evo_channel_del(struct nouveau_channel **pevo)
        nouveau_bo_ref(NULL, &evo->push.buffer);
 
        if (evo->object)
-               iounmap(evo->object->oclass->ofuncs);
+               iounmap(((struct evo_object *)evo->object)->iomem);
 
        kfree(evo);
 }
@@ -112,6 +117,7 @@ nv50_evo_channel_new(struct drm_device *dev, int chid,
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nv50_display *disp = nv50_display(dev);
        struct nouveau_channel *evo;
+       struct evo_object *evo_object;
        int ret;
 
        evo = kzalloc(sizeof(struct nouveau_channel), GFP_KERNEL);
@@ -142,7 +148,8 @@ nv50_evo_channel_new(struct drm_device *dev, int chid,
                return ret;
        }
 
-       evo->object = kzalloc(sizeof(*evo->object), GFP_KERNEL);
+       evo_object = kzalloc(sizeof(*evo_object), GFP_KERNEL);
+       evo->object = &evo_object->parent;
 #ifdef NOUVEAU_OBJECT_MAGIC
        evo->object->_magic = NOUVEAU_OBJECT_MAGIC;
 #endif
@@ -154,8 +161,7 @@ nv50_evo_channel_new(struct drm_device *dev, int chid,
                kzalloc(sizeof(*evo->object->oclass->ofuncs), GFP_KERNEL);
        evo->object->oclass->ofuncs->rd32 = nv50_evo_rd32;
        evo->object->oclass->ofuncs->wr32 = nv50_evo_wr32;
-       evo->object->oclass->ofuncs->rd08 =
-               ioremap(pci_resource_start(dev->pdev, 0) +
+       evo_object->iomem = ioremap(pci_resource_start(dev->pdev, 0) +
                        NV50_PDISPLAY_USER(evo->handle), PAGE_SIZE);
        return 0;
 }
-- 
1.7.12

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau