diff options
author | Alexandre Courbot <gnurou@gmail.com> | 2016-02-11 11:09:52 +0900 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2016-02-25 13:22:10 +1000 |
commit | 88bb3b73debd696c73234b276dd70a41cefe0381 (patch) | |
tree | 6d22960fa34c391c5ed2a7cedeae43c3c472af3f | |
parent | bfc40905365af30f47c14f26114fba495a02781a (diff) | |
download | nouveau-88bb3b73debd696c73234b276dd70a41cefe0381.tar.gz |
devinit/nv50: remove unneeded variable
We never use any nv50-specific member in this nv50_devinit_preinit().
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drm/nouveau/nvkm/subdev/devinit/nv50.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drm/nouveau/nvkm/subdev/devinit/nv50.c b/drm/nouveau/nvkm/subdev/devinit/nv50.c index 337c2c692..c714b0977 100644 --- a/drm/nouveau/nvkm/subdev/devinit/nv50.c +++ b/drm/nouveau/nvkm/subdev/devinit/nv50.c @@ -93,28 +93,27 @@ nv50_devinit_disable(struct nvkm_devinit *init) void nv50_devinit_preinit(struct nvkm_devinit *base) { - struct nv50_devinit *init = nv50_devinit(base); - struct nvkm_subdev *subdev = &init->base.subdev; + struct nvkm_subdev *subdev = &base->subdev; struct nvkm_device *device = subdev->device; /* our heuristics can't detect whether the board has had its * devinit scripts executed or not if the display engine is * missing, assume it's a secondary gpu which requires post */ - if (!init->base.post) { - u64 disable = nvkm_devinit_disable(&init->base); + if (!base->post) { + u64 disable = nvkm_devinit_disable(base); if (disable & (1ULL << NVKM_ENGINE_DISP)) - init->base.post = true; + base->post = true; } /* magic to detect whether or not x86 vbios code has executed * the devinit scripts to initialise the board */ - if (!init->base.post) { + if (!base->post) { if (!nvkm_rdvgac(device, 0, 0x00) && !nvkm_rdvgac(device, 0, 0x1a)) { nvkm_debug(subdev, "adaptor not initialised\n"); - init->base.post = true; + base->post = true; } } } |