These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / fuse / gm107.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
index 0b256aa..9aff4ea 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
@@ -23,40 +23,20 @@
  */
 #include "priv.h"
 
-struct gm107_fuse_priv {
-       struct nvkm_fuse base;
-};
-
 static u32
-gm107_fuse_rd32(struct nvkm_object *object, u64 addr)
+gm107_fuse_read(struct nvkm_fuse *fuse, u32 addr)
 {
-       struct gf100_fuse_priv *priv = (void *)object;
-       return nv_rd32(priv, 0x21100 + addr);
+       struct nvkm_device *device = fuse->subdev.device;
+       return nvkm_rd32(device, 0x021100 + addr);
 }
 
+static const struct nvkm_fuse_func
+gm107_fuse = {
+       .read = gm107_fuse_read,
+};
 
-static int
-gm107_fuse_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-               struct nvkm_oclass *oclass, void *data, u32 size,
-               struct nvkm_object **pobject)
+int
+gm107_fuse_new(struct nvkm_device *device, int index, struct nvkm_fuse **pfuse)
 {
-       struct gm107_fuse_priv *priv;
-       int ret;
-
-       ret = nvkm_fuse_create(parent, engine, oclass, &priv);
-       *pobject = nv_object(priv);
-
-       return ret;
+       return nvkm_fuse_new_(&gm107_fuse, device, index, pfuse);
 }
-
-struct nvkm_oclass
-gm107_fuse_oclass = {
-       .handle = NV_SUBDEV(FUSE, 0x117),
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gm107_fuse_ctor,
-               .dtor = _nvkm_fuse_dtor,
-               .init = _nvkm_fuse_init,
-               .fini = _nvkm_fuse_fini,
-               .rd32 = gm107_fuse_rd32,
-       },
-};