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

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

Browse Source 
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>
This commit is contained in:
Alexandre Courbot 2016-12-14 17:02:35 +09:00 committed by Ben Skeggs
parent c8225b54fe
commit 808d6efdeb
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
View File

@ -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);

4
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
View File

@ -1253,7 +1253,7 @@ end:
}
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) |

6
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
View File

@ -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,

4
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
View File

@ -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);