Commit 3a8c3400 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent aa35888f

drivers/gpu/drm/nouveau/include/nvkm/core/engine.h

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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