diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:16 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:33 +1000 |
| commit | 3a8c3400f3e74638bedd0d2410416aa8b794c0fd (patch) | |
| tree | 58e96ece8de1e14939754ecb14f126d8bb937c2d /drivers/gpu/drm/nouveau/nvkm/subdev/pmu | |
| parent | aa35888ff024b18c7b6b29eb773a221f642987f7 (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/pmu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c index 247994017965..c700d3d956e8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c @@ -189,7 +189,7 @@ _nvkm_pmu_fini(struct nvkm_object *object, bool suspend) nvkm_wr32(device, 0x10a014, 0x00000060); flush_work(&pmu->recv.work); - return nvkm_subdev_fini(&pmu->subdev, suspend); + return nvkm_subdev_fini_old(&pmu->subdev, suspend); } int @@ -200,7 +200,7 @@ _nvkm_pmu_init(struct nvkm_object *object) struct nvkm_device *device = pmu->subdev.device; int ret, i; - ret = nvkm_subdev_init(&pmu->subdev); + ret = nvkm_subdev_init_old(&pmu->subdev); if (ret) return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c index 1003013666a9..47c6dbe8fff3 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c @@ -171,7 +171,7 @@ gk20a_pmu_fini(struct nvkm_object *object, bool suspend) nvkm_timer_alarm_cancel(pmu, &pmu->alarm); - return nvkm_subdev_fini(&pmu->base.subdev, suspend); + return nvkm_subdev_fini_old(&pmu->base.subdev, suspend); } static int @@ -181,7 +181,7 @@ gk20a_pmu_init(struct nvkm_object *object) struct nvkm_device *device = pmu->base.subdev.device; int ret; - ret = nvkm_subdev_init(&pmu->base.subdev); + ret = nvkm_subdev_init_old(&pmu->base.subdev); if (ret) return ret; |