3 files changed, 5 insertions, 5 deletions
diff --git a/nvkm/include/core/engine.h b/nvkm/include/core/engine.h
index be04250a..d7ebd35e 100644
--- a/nvkm/include/core/engine.h
+++ b/nvkm/include/core/engine.h
@@ -30,9 +30,9 @@ nv_engine(void *obj)
 }
 
 static inline int
-nv_engidx(struct nouveau_object *object)
+nv_engidx(struct nouveau_engine *engine)
 {
-	return nv_subidx(object);
+	return nv_subidx(&engine->subdev);
 }
 
 struct nouveau_engine *nouveau_engine(void *obj, int idx);
diff --git a/nvkm/include/core/object.h b/nvkm/include/core/object.h
index 2e2afa50..64c0038f 100644
--- a/nvkm/include/core/object.h
+++ b/nvkm/include/core/object.h
@@ -17,7 +17,7 @@
 struct nouveau_object {
 	struct nouveau_oclass *oclass;
 	struct nouveau_object *parent;
-	struct nouveau_object *engine;
+	struct nouveau_engine *engine;
 	atomic_t refcount;
 	atomic_t usecount;
 #if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
diff --git a/nvkm/include/core/subdev.h b/nvkm/include/core/subdev.h
index d9739aed..68f1c419 100644
--- a/nvkm/include/core/subdev.h
+++ b/nvkm/include/core/subdev.h
@@ -28,9 +28,9 @@ nv_subdev(void *obj)
 }
 
 static inline int
-nv_subidx(struct nouveau_object *object)
+nv_subidx(struct nouveau_subdev *subdev)
 {
-	return nv_hclass(nv_subdev(object)) & 0xff;
+	return nv_hclass(subdev) & 0xff;
 }
 
 struct nouveau_subdev *nouveau_subdev(void *obj, int idx);