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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/driver.h b/drivers/gpu/drm/nouveau/include/nvif/driver.h
index 8d294ce3cf0a6224363b31e0ba4fd5a9f015ecaa..7b08ff769039a3f6e65889761335c1955673fb34 100644 (file)
--- 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 9a7e3f64b79f00a63db6b06960e876e9c13aa08b..adb802421fda588855cf8cb312c3dcfc09716f2d 100644 (file)
--- 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 cd5439b73ac7f0881526cef62b184ef926dd4ffc..85ad5091e8e27454d76a07ad95dd710d2441c89c 100644 (file)
--- 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