diff options
author | Ben Skeggs | 2014-01-14 06:55:38 +0100 |
---|---|---|
committer | Ben Skeggs | 2014-01-23 04:39:12 +0100 |
commit | cf336014c6dc3ef1431d84b5a94e47a22660493b (patch) | |
tree | 150e3087901cd03435775ece8baf55ffc072813d /drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c | |
parent | drm/nouveau/bar: tidy up the subdev and object class definitions (diff) | |
download | kernel-qcow2-linux-cf336014c6dc3ef1431d84b5a94e47a22660493b.tar.gz kernel-qcow2-linux-cf336014c6dc3ef1431d84b5a94e47a22660493b.tar.xz kernel-qcow2-linux-cf336014c6dc3ef1431d84b5a94e47a22660493b.zip |
drm/nouveau/devinit: tidy up the subdev class definition
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c b/drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c index e9743cdabe75..526d0c6faacd 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c +++ b/drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c @@ -22,37 +22,16 @@ * Authors: Ben Skeggs */ -#include "priv.h" +#include "nv04.h" -struct nv1a_devinit_priv { - struct nouveau_devinit base; - u8 owner; -}; - -static int -nv1a_devinit_ctor(struct nouveau_object *parent, struct nouveau_object *engine, - struct nouveau_oclass *oclass, void *data, u32 size, - struct nouveau_object **pobject) -{ - struct nv1a_devinit_priv *priv; - int ret; - - ret = nouveau_devinit_create(parent, engine, oclass, &priv); - *pobject = nv_object(priv); - if (ret) - return ret; - - priv->base.pll_set = nv04_devinit_pll_set; - return 0; -} - -struct nouveau_oclass -nv1a_devinit_oclass = { - .handle = NV_SUBDEV(DEVINIT, 0x1a), - .ofuncs = &(struct nouveau_ofuncs) { - .ctor = nv1a_devinit_ctor, +struct nouveau_oclass * +nv1a_devinit_oclass = &(struct nouveau_devinit_impl) { + .base.handle = NV_SUBDEV(DEVINIT, 0x1a), + .base.ofuncs = &(struct nouveau_ofuncs) { + .ctor = nv04_devinit_ctor, .dtor = nv04_devinit_dtor, .init = nv04_devinit_init, .fini = nv04_devinit_fini, }, -}; + .pll_set = nv04_devinit_pll_set, +}.base; |