leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/nvif: rename client ctor/dtor

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs 2020-03-30 13:45:33 +10:00
parent 188e905ce4
commit 6db25fb13a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/include/nvif/client.h
View File

@ -12,9 +12,9 @@ struct nvif_client {
bool super; 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 *); 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_ioctl(struct nvif_client *, void *, u32);
int nvif_client_suspend(struct nvif_client *); int nvif_client_suspend(struct nvif_client *);
int nvif_client_resume(struct nvif_client *); int nvif_client_resume(struct nvif_client *);

4
drivers/gpu/drm/nouveau/nouveau_drm.c
View File

@ -181,7 +181,7 @@ nouveau_cli_fini(struct nouveau_cli *cli)
nvif_mmu_fini(&cli->mmu); nvif_mmu_fini(&cli->mmu);
nvif_device_fini(&cli->device); nvif_device_fini(&cli->device);
mutex_lock(&cli->drm->master.lock); mutex_lock(&cli->drm->master.lock);
nvif_client_fini(&cli->base); nvif_client_dtor(&cli->base);
mutex_unlock(&cli->drm->master.lock); 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); cli->name, device, &cli->base);
} else { } else {
mutex_lock(&drm->master.lock); 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); &cli->base);
mutex_unlock(&drm->master.lock); mutex_unlock(&drm->master.lock);
} }

6
drivers/gpu/drm/nouveau/nvif/client.c
View File

@ -48,7 +48,7 @@ nvif_client_resume(struct nvif_client *client)
} }
void void
nvif_client_fini(struct nvif_client *client) nvif_client_dtor(struct nvif_client *client)
{ {
nvif_object_fini(&client->object); nvif_object_fini(&client->object);
if (client->driver) { if (client->driver) {
@ -59,7 +59,7 @@ nvif_client_fini(struct nvif_client *client)
} }
int 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 *client)
{ {
struct nvif_client_v0 args = { .device = device }; 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) if (ret)
nvif_client_fini(client); nvif_client_dtor(client);
return ret; return ret;
} }

2
drivers/gpu/drm/nouveau/nvif/driver.c
View File

@ -53,6 +53,6 @@ nvif_driver_init(const char *drv, const char *cfg, const char *dbg,
} }
if (ret == 0) if (ret == 0)
ret = nvif_client_init(client, name, device, client); ret = nvif_client_ctor(client, name, device, client);
return ret; return ret;
} }