summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/mc
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:16 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:33 +1000
commit3a8c3400f3e74638bedd0d2410416aa8b794c0fd (patch)
tree58e96ece8de1e14939754ecb14f126d8bb937c2d /drivers/gpu/drm/nouveau/nvkm/subdev/mc
parentaa35888ff024b18c7b6b29eb773a221f642987f7 (diff)
drm/nouveau/subdev: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mc')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
index babd6d8725f0..f861a02d8d59 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
@@ -86,7 +86,7 @@ _nvkm_mc_fini(struct nvkm_object *object, bool suspend)
struct nvkm_mc *mc = (void *)object;
struct nvkm_device *device = mc->subdev.device;
nvkm_wr32(device, 0x000140, 0x00000000);
- return nvkm_subdev_fini(&mc->subdev, suspend);
+ return nvkm_subdev_fini_old(&mc->subdev, suspend);
}
int
@@ -94,7 +94,7 @@ _nvkm_mc_init(struct nvkm_object *object)
{
struct nvkm_mc *mc = (void *)object;
struct nvkm_device *device = mc->subdev.device;
- int ret = nvkm_subdev_init(&mc->subdev);
+ int ret = nvkm_subdev_init_old(&mc->subdev);
if (ret)
return ret;
nvkm_wr32(device, 0x000140, 0x00000001);