diff options
| author | Ben Skeggs <bskeggs@nvidia.com> | 2024-07-26 06:38:09 +0200 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2024-07-27 03:05:31 +0200 |
| commit | 7e0d8de4d35789b57eee8acb0a952b854edb37a1 (patch) | |
| tree | 48b3d6f03edf1504ee31d2c27493ac99873aaa86 | |
| parent | drm/nouveau/nvif: remove nvxx_client() (diff) | |
| download | linux-7e0d8de4d35789b57eee8acb0a952b854edb37a1.tar.xz linux-7e0d8de4d35789b57eee8acb0a952b854edb37a1.zip | |
drm/nouveau/nvif: remove driver keep/fini
These are remnants of code long gone. Remove them.
Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-19-bskeggs@nvidia.com
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/driver.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_nvif.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvif/client.c | 6 |
3 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/driver.h b/drivers/gpu/drm/nouveau/include/nvif/driver.h index 8d294ce3cf0a..7b08ff769039 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/driver.h +++ b/drivers/gpu/drm/nouveau/include/nvif/driver.h @@ -8,13 +8,11 @@ struct nvif_driver { const char *name; int (*init)(const char *name, u64 device, const char *cfg, const char *dbg, void **priv); - void (*fini)(void *priv); int (*suspend)(void *priv); int (*resume)(void *priv); int (*ioctl)(void *priv, void *data, u32 size, void **hack); void __iomem *(*map)(void *priv, u64 handle, u32 size); void (*unmap)(void *priv, void __iomem *ptr, u32 size); - bool keep; }; int nvif_driver_init(const char *drv, const char *cfg, const char *dbg, diff --git a/drivers/gpu/drm/nouveau/nouveau_nvif.c b/drivers/gpu/drm/nouveau/nouveau_nvif.c index 9a7e3f64b79f..adb802421fda 100644 --- a/drivers/gpu/drm/nouveau/nouveau_nvif.c +++ b/drivers/gpu/drm/nouveau/nouveau_nvif.c @@ -97,5 +97,4 @@ nvif_driver_nvkm = { .ioctl = nvkm_client_ioctl, .map = nvkm_client_map, .unmap = nvkm_client_unmap, - .keep = false, }; diff --git a/drivers/gpu/drm/nouveau/nvif/client.c b/drivers/gpu/drm/nouveau/nvif/client.c index cd5439b73ac7..85ad5091e8e2 100644 --- a/drivers/gpu/drm/nouveau/nvif/client.c +++ b/drivers/gpu/drm/nouveau/nvif/client.c @@ -51,11 +51,7 @@ void nvif_client_dtor(struct nvif_client *client) { nvif_object_dtor(&client->object); - if (client->driver) { - if (client->driver->fini) - client->driver->fini(client->object.priv); - client->driver = NULL; - } + client->driver = NULL; } int |