drm/nouveau/imem/nv04: directly embed nvkm_instobj into nv04_instobj

#define nv04_instmem(p) container_of((p), struct nv04_instmem, base)

#include "priv.h"

#include <core/memory.h>

#include <core/ramht.h>

struct nv04_instmem {

/******************************************************************************

 * instmem object implementation

 *****************************************************************************/

#define nv04_instobj(p) container_of((p), struct nv04_instobj, memory)

#define nv04_instobj(p) container_of((p), struct nv04_instobj, base.memory)

struct nv04_instobj {

	struct nvkm_memory memory;

	struct nvkm_instobj base;

	struct nv04_instmem *imem;

	struct nvkm_mm_node *node;

};

	mutex_lock(&iobj->imem->base.subdev.mutex);

	nvkm_mm_free(&iobj->imem->heap, &iobj->node);

	mutex_unlock(&iobj->imem->base.subdev.mutex);

	nvkm_instobj_dtor(&iobj->imem->base, &iobj->base);

	return iobj;

}

	if (!(iobj = kzalloc(sizeof(*iobj), GFP_KERNEL)))

		return -ENOMEM;

	*pmemory = &iobj->memory;

	*pmemory = &iobj->base.memory;

	nvkm_memory_ctor(&nv04_instobj_func, &iobj->memory);

	iobj->memory.ptrs = &nv04_instobj_ptrs;

	nvkm_instobj_ctor(&nv04_instobj_func, &imem->base, &iobj->base);

	iobj->base.memory.ptrs = &nv04_instobj_ptrs;

	iobj->imem = imem;

	mutex_lock(&imem->base.subdev.mutex);

	.rd32 = nv04_instmem_rd32,

	.wr32 = nv04_instmem_wr32,

	.memory_new = nv04_instobj_new,

	.persistent = false,

	.persistent = true,

	.zero = false,

};