Commit 6db25fb1 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/nvif: rename client ctor/dtor

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 188e905c
......@@ -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 *);
......
......@@ -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);
}
......
......@@ -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;
}
......@@ -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;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment