drm/nouveau/secboot: rename init() hook to oneinit()

The init() hook is called by the subdev's oneinit(). Rename it
accordingly to avoid confusion about the lifetime of objects allocated
in it.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
index f423a1c1ae2901e233aa2fa1caece37f400b1e8a..525740edaf75532be16e67c6f6526dbf92c294a3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
@@ -78,8 +78,8 @@ nvkm_secboot_oneinit(struct nvkm_subdev *subdev)
        }
 
        /* Call chip-specific init function */
-       if (sb->func->init)
-               ret = sb->func->init(sb);
+       if (sb->func->oneinit)
+               ret = sb->func->oneinit(sb);
        if (ret) {
                nvkm_error(subdev, "Secure Boot initialization failed: %d\n",
                           ret);

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
index 6f99cf2d27cdc53f18091b422398d1e7027772bb..98d18eccbb6f3332916683c01f36827e263b46c3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
@@ -1253,7 +1253,7 @@ gm200_secboot_reset(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon)
 }
 
 int
-gm200_secboot_init(struct nvkm_secboot *sb)
+gm200_secboot_oneinit(struct nvkm_secboot *sb)
 {
        struct gm200_secboot *gsb = gm200_secboot(sb);
        struct nvkm_device *device = sb->subdev.device;
@@ -1332,7 +1332,7 @@ gm200_secboot_dtor(struct nvkm_secboot *sb)
 static const struct nvkm_secboot_func
 gm200_secboot = {
        .dtor = gm200_secboot_dtor,
-       .init = gm200_secboot_init,
+       .oneinit = gm200_secboot_oneinit,
        .fini = gm200_secboot_fini,
        .reset = gm200_secboot_reset,
        .managed_falcons = BIT(NVKM_SECBOOT_FALCON_FECS) |

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
index 50f503b5d1cee75b56813fa867c3e01891bfd152..c08eb775d3a6a2dff8aa8489ce1dd8b53ecefc19 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
@@ -174,7 +174,7 @@ gm20b_tegra_read_wpr(struct gm200_secboot *gsb)
 #endif
 
 static int
-gm20b_secboot_init(struct nvkm_secboot *sb)
+gm20b_secboot_oneinit(struct nvkm_secboot *sb)
 {
        struct gm200_secboot *gsb = gm200_secboot(sb);
        int ret;
@@ -183,13 +183,13 @@ gm20b_secboot_init(struct nvkm_secboot *sb)
        if (ret)
                return ret;
 
-       return gm200_secboot_init(sb);
+       return gm200_secboot_oneinit(sb);
 }
 
 static const struct nvkm_secboot_func
 gm20b_secboot = {
        .dtor = gm200_secboot_dtor,
-       .init = gm20b_secboot_init,
+       .oneinit = gm20b_secboot_oneinit,
        .reset = gm200_secboot_reset,
        .managed_falcons = BIT(NVKM_SECBOOT_FALCON_FECS),
        .boot_falcon = NVKM_SECBOOT_FALCON_PMU,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
index d23c94c8e597a6653e30e890aefa7cd837dfb2a6..393b945f3d8df9641189299e1a76b414a20ff7e2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
@@ -27,7 +27,7 @@
 #include <subdev/mmu.h>
 
 struct nvkm_secboot_func {
-       int (*init)(struct nvkm_secboot *);
+       int (*oneinit)(struct nvkm_secboot *);
        int (*fini)(struct nvkm_secboot *, bool suspend);
        void *(*dtor)(struct nvkm_secboot *);
        int (*reset)(struct nvkm_secboot *, enum nvkm_secboot_falcon);
@@ -221,7 +221,7 @@ struct gm200_secboot_func {
        int (*prepare_blobs)(struct gm200_secboot *);
 };
 
-int gm200_secboot_init(struct nvkm_secboot *);
+int gm200_secboot_oneinit(struct nvkm_secboot *);
 void *gm200_secboot_dtor(struct nvkm_secboot *);
 int gm200_secboot_reset(struct nvkm_secboot *, enum nvkm_secboot_falcon);
 int gm200_secboot_start(struct nvkm_secboot *, enum nvkm_secboot_falcon);