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/include | |
| 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/include')
8 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h index 0b5f05aec2df..3212b12a70ed 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h @@ -41,9 +41,9 @@ struct nvkm_engine *nvkm_engine(void *obj, int idx); #define nvkm_engine_destroy(p) \ nvkm_subdev_destroy(&(p)->subdev) #define nvkm_engine_init(p) \ - nvkm_subdev_init(&(p)->subdev) + nvkm_subdev_init_old(&(p)->subdev) #define nvkm_engine_fini(p,s) \ - nvkm_subdev_fini(&(p)->subdev, (s)) + nvkm_subdev_fini_old(&(p)->subdev, (s)) int nvkm_engine_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, bool, const char *, diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h index ce5f1b93ef9a..d3e08bf8d977 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h @@ -44,8 +44,8 @@ int nvkm_subdev_create_(struct nvkm_object *, struct nvkm_object *, const char *sname, const char *fname, int size, void **); void nvkm_subdev_destroy(struct nvkm_subdev *); -int nvkm_subdev_init(struct nvkm_subdev *); -int nvkm_subdev_fini(struct nvkm_subdev *, bool suspend); +int nvkm_subdev_init_old(struct nvkm_subdev *); +int nvkm_subdev_fini_old(struct nvkm_subdev *, bool suspend); void nvkm_subdev_reset(struct nvkm_object *); void _nvkm_subdev_dtor(struct nvkm_object *); diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h index ce7663c60015..5cf58a15bf41 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h @@ -25,9 +25,9 @@ nvkm_bus(void *obj) #define nvkm_bus_destroy(p) \ nvkm_subdev_destroy(&(p)->subdev) #define nvkm_bus_init(p) \ - nvkm_subdev_init(&(p)->subdev) + nvkm_subdev_init_old(&(p)->subdev) #define nvkm_bus_fini(p, s) \ - nvkm_subdev_fini(&(p)->subdev, (s)) + nvkm_subdev_fini_old(&(p)->subdev, (s)) #define _nvkm_bus_dtor _nvkm_subdev_dtor #define _nvkm_bus_init _nvkm_subdev_init diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h index 3538e87a4452..8fc7946b8a42 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h @@ -18,9 +18,9 @@ nvkm_ibus(void *obj) #define nvkm_ibus_destroy(p) \ nvkm_subdev_destroy(&(p)->subdev) #define nvkm_ibus_init(p) \ - nvkm_subdev_init(&(p)->subdev) + nvkm_subdev_init_old(&(p)->subdev) #define nvkm_ibus_fini(p,s) \ - nvkm_subdev_fini(&(p)->subdev, (s)) + nvkm_subdev_fini_old(&(p)->subdev, (s)) #define _nvkm_ibus_dtor _nvkm_subdev_dtor #define _nvkm_ibus_init _nvkm_subdev_init diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h index b596a1dd5b81..2bf8f46c1bb0 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h @@ -71,9 +71,9 @@ nvkm_mmu(void *obj) #define nvkm_mmu_destroy(p) \ nvkm_subdev_destroy(&(p)->subdev) #define nvkm_mmu_init(p) \ - nvkm_subdev_init(&(p)->subdev) + nvkm_subdev_init_old(&(p)->subdev) #define nvkm_mmu_fini(p,s) \ - nvkm_subdev_fini(&(p)->subdev, (s)) + nvkm_subdev_fini_old(&(p)->subdev, (s)) #define _nvkm_mmu_dtor _nvkm_subdev_dtor #define _nvkm_mmu_init _nvkm_subdev_init diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h index 98904392547d..93f9a4ec2320 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h @@ -19,9 +19,9 @@ nvkm_mxm(void *obj) #define nvkm_mxm_create(p,e,o,d) \ nvkm_mxm_create_((p), (e), (o), sizeof(**d), (void **)d) #define nvkm_mxm_init(p) \ - nvkm_subdev_init(&(p)->subdev) + nvkm_subdev_init_old(&(p)->subdev) #define nvkm_mxm_fini(p,s) \ - nvkm_subdev_fini(&(p)->subdev, (s)) + nvkm_subdev_fini_old(&(p)->subdev, (s)) int nvkm_mxm_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, int, void **); void nvkm_mxm_destroy(struct nvkm_mxm *); diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h index 4ae73689488b..f818adcc7467 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h @@ -70,9 +70,9 @@ nvkm_timer(void *obj) #define nvkm_timer_destroy(p) \ nvkm_subdev_destroy(&(p)->subdev) #define nvkm_timer_init(p) \ - nvkm_subdev_init(&(p)->subdev) + nvkm_subdev_init_old(&(p)->subdev) #define nvkm_timer_fini(p,s) \ - nvkm_subdev_fini(&(p)->subdev, (s)) + nvkm_subdev_fini_old(&(p)->subdev, (s)) int nvkm_timer_create_(struct nvkm_object *, struct nvkm_engine *, struct nvkm_oclass *, int size, void **); diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h index 1eeb80a380d2..dc8846899a60 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h @@ -41,7 +41,7 @@ nvkm_volt(void *obj) _nvkm_volt_init(nv_object(v)); \ }) #define nvkm_volt_fini(p,s) \ - nvkm_subdev_fini((p), (s)) + nvkm_subdev_fini_old((p), (s)) int nvkm_volt_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, int, void **); |