summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/therm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 07:54:16 +0300
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 05:40:33 +0300
commit3a8c3400f3e74638bedd0d2410416aa8b794c0fd (patch)
tree58e96ece8de1e14939754ecb14f126d8bb937c2d /drivers/gpu/drm/nouveau/nvkm/subdev/therm
parentaa35888ff024b18c7b6b29eb773a221f642987f7 (diff)
downloadlinux-3a8c3400f3e74638bedd0d2410416aa8b794c0fd.tar.xz
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/therm')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
index 18fa0443b6d3..e757fd9b7a07 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
@@ -288,7 +288,7 @@ _nvkm_therm_init(struct nvkm_object *object)
struct nvkm_therm_priv *therm = (void *)object;
int ret;
- ret = nvkm_subdev_init(&therm->base.subdev);
+ ret = nvkm_subdev_init_old(&therm->base.subdev);
if (ret)
return ret;
@@ -316,7 +316,7 @@ _nvkm_therm_fini(struct nvkm_object *object, bool suspend)
therm->mode = NVKM_THERM_CTRL_NONE;
}
- return nvkm_subdev_fini(&therm->base.subdev, suspend);
+ return nvkm_subdev_fini_old(&therm->base.subdev, suspend);
}
int