drm/nouveau/nvif: rename client ctor/dtor

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvif/client.h b/drivers/gpu/drm/nouveau/include/nvif/client.h
index e63c6c965b543d08939dab8f9111eb6ae4978d11..347d2c020bd194cbcacae4d8eaf7d1694a6d9c79 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/client.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/client.h
@@ -12,9 +12,9 @@ struct nvif_client {
        bool super;
 };
 
-int  nvif_client_init(struct nvif_client *parent, const char *name, u64 device,
+int  nvif_client_ctor(struct nvif_client *parent, const char *name, u64 device,
                      struct nvif_client *);
-void nvif_client_fini(struct nvif_client *);
+void nvif_client_dtor(struct nvif_client *);
 int  nvif_client_ioctl(struct nvif_client *, void *, u32);
 int  nvif_client_suspend(struct nvif_client *);
 int  nvif_client_resume(struct nvif_client *);

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 880d962c1b19a8f8ac6835c8dbb117ea94148d0d..0bf05d9139feee0a6bf1416c5df814a18dcb473f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -181,7 +181,7 @@ nouveau_cli_fini(struct nouveau_cli *cli)
        nvif_mmu_fini(&cli->mmu);
        nvif_device_fini(&cli->device);
        mutex_lock(&cli->drm->master.lock);
-       nvif_client_fini(&cli->base);
+       nvif_client_dtor(&cli->base);
        mutex_unlock(&cli->drm->master.lock);
 }
 
@@ -229,7 +229,7 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
                                       cli->name, device, &cli->base);
        } else {
                mutex_lock(&drm->master.lock);
-               ret = nvif_client_init(&drm->master.base, cli->name, device,
+               ret = nvif_client_ctor(&drm->master.base, cli->name, device,
                                       &cli->base);
                mutex_unlock(&drm->master.lock);
        }

diff --git a/drivers/gpu/drm/nouveau/nvif/client.c b/drivers/gpu/drm/nouveau/nvif/client.c
index 12db54965c20707b1d85ce8f02905b22c7338572..a36902c1c287e2129e324708f48ad9f103af73c5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvif/client.c
+++ b/drivers/gpu/drm/nouveau/nvif/client.c
@@ -48,7 +48,7 @@ nvif_client_resume(struct nvif_client *client)
 }
 
 void
-nvif_client_fini(struct nvif_client *client)
+nvif_client_dtor(struct nvif_client *client)
 {
        nvif_object_fini(&client->object);
        if (client->driver) {
@@ -59,7 +59,7 @@ nvif_client_fini(struct nvif_client *client)
 }
 
 int
-nvif_client_init(struct nvif_client *parent, const char *name, u64 device,
+nvif_client_ctor(struct nvif_client *parent, const char *name, u64 device,
                 struct nvif_client *client)
 {
        struct nvif_client_v0 args = { .device = device };
@@ -88,6 +88,6 @@ nvif_client_init(struct nvif_client *parent, const char *name, u64 device,
        }
 
        if (ret)
-               nvif_client_fini(client);
+               nvif_client_dtor(client);
        return ret;
 }

diff --git a/drivers/gpu/drm/nouveau/nvif/driver.c b/drivers/gpu/drm/nouveau/nvif/driver.c
index 701330956e33d70961e2582cdfb52c0f5b05d7c8..5e00dd07afed619bbaa60539149e6beb11e1ddfc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvif/driver.c
+++ b/drivers/gpu/drm/nouveau/nvif/driver.c
@@ -53,6 +53,6 @@ nvif_driver_init(const char *drv, const char *cfg, const char *dbg,
        }
 
        if (ret == 0)
-               ret = nvif_client_init(client, name, device, client);
+               ret = nvif_client_ctor(client, name, device, client);
        return ret;
 }