From 4bb4a7466af6d96d4fc8471336eb738d13c2471c Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 19 May 2017 23:59:34 +1000
Subject: [PATCH] drm/nouveau/bios/init: rename nvbios_init() to nvbios_devinit()
Git-commit: 4bb4a7466af6d96d4fc8471336eb738d13c2471c
Patch-mainline: v4.13-rc1
References: bsc#1095094
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
@@ -17,5 +17,5 @@ struct nvbios_init {
};
int nvbios_exec(struct nvbios_init *);
-int nvbios_init(struct nvkm_subdev *, bool execute);
+int nvbios_post(struct nvkm_subdev *, bool execute);
#endif
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
@@ -2290,7 +2290,7 @@ nvbios_exec(struct nvbios_init *init)
}
int
-nvbios_init(struct nvkm_subdev *subdev, bool execute)
+nvbios_post(struct nvkm_subdev *subdev, bool execute)
{
struct nvkm_bios *bios = subdev->device->bios;
int ret = 0;
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
@@ -393,7 +393,7 @@ nv04_devinit_pll_set(struct nvkm_devinit
int
nv04_devinit_post(struct nvkm_devinit *init, bool execute)
{
- return nvbios_init(&init->subdev, execute);
+ return nvbios_post(&init->subdev, execute);
}
void