drm/nouveau/subdev: rename some functions to avoid upcoming conflicts

Signed-off-by: NBen Skeggs <bskeggs@redhat.com>

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 *,

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 *);

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

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

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

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 *);

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 **);

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 **);

drivers/gpu/drm/nouveau/nvkm/core/subdev.c

@@ -46,7 +46,7 @@ nvkm_subdev_reset(struct nvkm_object *obj)
 }
 
 int
-nvkm_subdev_init(struct nvkm_subdev *subdev)
+nvkm_subdev_init_old(struct nvkm_subdev *subdev)
 {
 	int ret = _nvkm_object_init(&subdev->object);
 	if (ret)
@@ -59,11 +59,12 @@ nvkm_subdev_init(struct nvkm_subdev *subdev)
 int
 _nvkm_subdev_init(struct nvkm_object *object)
 {
-	return nvkm_subdev_init(nv_subdev(object));
+	struct nvkm_subdev *subdev = (void *)object;
+	return nvkm_subdev_init_old(subdev);
 }
 
 int
-nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
+nvkm_subdev_fini_old(struct nvkm_subdev *subdev, bool suspend)
 {
 	struct nvkm_device *device = subdev->device;
 
@@ -78,7 +79,8 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
 int
 _nvkm_subdev_fini(struct nvkm_object *object, bool suspend)
 {
-	return nvkm_subdev_fini(nv_subdev(object), suspend);
+	struct nvkm_subdev *subdev = (void *)object;
+	return nvkm_subdev_fini_old(subdev, suspend);
 }
 
 void

drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h

@@ -5,9 +5,9 @@
 #define nvkm_bar_create(p,e,o,d)                                            \
 	nvkm_bar_create_((p), (e), (o), sizeof(**d), (void **)d)
 #define nvkm_bar_init(p)                                                    \
-	nvkm_subdev_init(&(p)->subdev)
+	nvkm_subdev_init_old(&(p)->subdev)
 #define nvkm_bar_fini(p,s)                                                  \
-	nvkm_subdev_fini(&(p)->subdev, (s))
+	nvkm_subdev_fini_old(&(p)->subdev, (s))
 
 int nvkm_bar_create_(struct nvkm_object *, struct nvkm_object *,
 			struct nvkm_oclass *, int, void **);

drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c

@@ -149,14 +149,14 @@ static int
 nvkm_bios_init(struct nvkm_object *object)
 {
 	struct nvkm_bios *bios = (void *)object;
-	return nvkm_subdev_init(&bios->subdev);
+	return nvkm_subdev_init_old(&bios->subdev);
 }
 
 static int
 nvkm_bios_fini(struct nvkm_object *object, bool suspend)
 {
 	struct nvkm_bios *bios = (void *)object;
-	return nvkm_subdev_fini(&bios->subdev, suspend);
+	return nvkm_subdev_fini_old(&bios->subdev, suspend);
 }
 
 struct nvkm_oclass

drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c

@@ -479,7 +479,7 @@ _nvkm_clk_fini(struct nvkm_object *object, bool suspend)
 {
 	struct nvkm_clk *clk = (void *)object;
 	nvkm_notify_put(&clk->pwrsrc_ntfy);
-	return nvkm_subdev_fini(&clk->subdev, suspend);
+	return nvkm_subdev_fini_old(&clk->subdev, suspend);
 }
 
 int
@@ -490,7 +490,7 @@ _nvkm_clk_init(struct nvkm_object *object)
 	struct nvkm_domain *clock = clk->domains;
 	int ret;
 
-	ret = nvkm_subdev_init(&clk->subdev);
+	ret = nvkm_subdev_init_old(&clk->subdev);
 	if (ret)
 		return ret;
 

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c

@@ -38,7 +38,7 @@ _nvkm_devinit_fini(struct nvkm_object *object, bool suspend)
 	/* unlock the extended vga crtc regs */
 	nvkm_lockvgac(init->subdev.device, false);
 
-	return nvkm_subdev_fini(&init->subdev, suspend);
+	return nvkm_subdev_fini_old(&init->subdev, suspend);
 }
 
 int
@@ -48,7 +48,7 @@ _nvkm_devinit_init(struct nvkm_object *object)
 	struct nvkm_devinit *init = (void *)object;
 	int ret;
 
-	ret = nvkm_subdev_init(&init->subdev);
+	ret = nvkm_subdev_init_old(&init->subdev);
 	if (ret)
 		return ret;
 

drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c

@@ -56,7 +56,7 @@ int
 _nvkm_fb_fini(struct nvkm_object *object, bool suspend)
 {
 	struct nvkm_fb *fb = (void *)object;
-	return nvkm_subdev_fini(&fb->subdev, suspend);
+	return nvkm_subdev_fini_old(&fb->subdev, suspend);
 }
 
 int
@@ -65,7 +65,7 @@ _nvkm_fb_init(struct nvkm_object *object)
 	struct nvkm_fb *fb = (void *)object;
 	int ret, i;
 
-	ret = nvkm_subdev_init(&fb->subdev);
+	ret = nvkm_subdev_init_old(&fb->subdev);
 	if (ret)
 		return ret;
 

drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c

@@ -27,7 +27,7 @@ int
 _nvkm_fuse_init(struct nvkm_object *object)
 {
 	struct nvkm_fuse *fuse = (void *)object;
-	return nvkm_subdev_init(&fuse->subdev);
+	return nvkm_subdev_init_old(&fuse->subdev);
 }
 
 void

drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c

@@ -168,7 +168,7 @@ _nvkm_gpio_fini(struct nvkm_object *object, bool suspend)
 	impl->intr_mask(gpio, NVKM_GPIO_TOGGLED, mask, 0);
 	impl->intr_stat(gpio, &mask, &mask);
 
-	return nvkm_subdev_fini(&gpio->subdev, suspend);
+	return nvkm_subdev_fini_old(&gpio->subdev, suspend);
 }
 
 static struct dmi_system_id gpio_reset_ids[] = {
@@ -188,7 +188,7 @@ _nvkm_gpio_init(struct nvkm_object *object)
 	struct nvkm_gpio *gpio = nvkm_gpio(object);
 	int ret;
 
-	ret = nvkm_subdev_init(&gpio->subdev);
+	ret = nvkm_subdev_init_old(&gpio->subdev);
 	if (ret)
 		return ret;
 

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c

@@ -175,7 +175,7 @@ _nvkm_i2c_fini(struct nvkm_object *object, bool suspend)
 		nvkm_i2c_pad_fini(pad);
 	}
 
-	return nvkm_subdev_fini(&i2c->subdev, suspend);
+	return nvkm_subdev_fini_old(&i2c->subdev, suspend);
 }
 
 int
@@ -186,7 +186,7 @@ _nvkm_i2c_init(struct nvkm_object *object)
 	struct nvkm_i2c_pad *pad;
 	int ret;
 
-	ret = nvkm_subdev_init(&i2c->subdev);
+	ret = nvkm_subdev_init_old(&i2c->subdev);
 	if (ret)
 		return ret;
 

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c

@@ -102,7 +102,7 @@ _nvkm_instmem_fini(struct nvkm_object *object, bool suspend)
 			return ret;
 	}
 
-	return nvkm_subdev_fini(&imem->subdev, suspend);
+	return nvkm_subdev_fini_old(&imem->subdev, suspend);
 }
 
 int
@@ -112,7 +112,7 @@ _nvkm_instmem_init(struct nvkm_object *object)
 	struct nvkm_instobj *iobj;
 	int ret, i;
 
-	ret = nvkm_subdev_init(&imem->subdev);
+	ret = nvkm_subdev_init_old(&imem->subdev);
 	if (ret)
 		return ret;
 

drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c

@@ -83,7 +83,7 @@ _nvkm_ltc_init(struct nvkm_object *object)
 	const struct nvkm_ltc_impl *impl = (void *)nv_oclass(object);
 	int ret, i;
 
-	ret = nvkm_subdev_init(&ltc->base.subdev);
+	ret = nvkm_subdev_init_old(&ltc->base.subdev);
 	if (ret)
 		return ret;
 

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);

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;
 

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;
 

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

drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c

@@ -142,7 +142,7 @@ _nvkm_volt_init(struct nvkm_object *object)
 	struct nvkm_subdev *subdev = &volt->subdev;
 	int ret;
 
-	ret = nvkm_subdev_init(&volt->subdev);
+	ret = nvkm_subdev_init_old(&volt->subdev);
 	if (ret)
 		return ret;