OSDN Git Service

drm/nouveau/devinit/nv50: remove unneeded variable
authorAlexandre Courbot <acourbot@nvidia.com>
Thu, 11 Feb 2016 02:09:52 +0000 (11:09 +0900)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 14 Mar 2016 00:13:15 +0000 (10:13 +1000)
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>
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c

index 337c2c6..c714b09 100644 (file)
@@ -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;
                }
        }
 }