drm/nouveau/instmem: tidy up the object class definition

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --cc drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/subdev/instmem/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/subdev/instmem/priv.h
Simple merge