Commit 60856812 authored by Guo Zhengkui's avatar Guo Zhengkui Committed by Lyude Paul

drm/nouveau/devinit: fix returnvar.cocci warnings

Fix the following coccicheck warnings:

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c:71:5-12:
Unneeded variable: "disable". Return "0ULL" on line 90.
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c:35:5-12:
Unneeded variable: "disable". Return "0ULL" on line 44.
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c:35:5-12:
Unneeded variable: "disable". Return "0ULL" on line 50.
Signed-off-by: default avatarGuo Zhengkui <guozhengkui@vivo.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220504161003.9245-1-guozhengkui@vivo.com
parent ea16c74c
...@@ -32,7 +32,6 @@ g98_devinit_disable(struct nvkm_devinit *init) ...@@ -32,7 +32,6 @@ g98_devinit_disable(struct nvkm_devinit *init)
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
u32 r001540 = nvkm_rd32(device, 0x001540); u32 r001540 = nvkm_rd32(device, 0x001540);
u32 r00154c = nvkm_rd32(device, 0x00154c); u32 r00154c = nvkm_rd32(device, 0x00154c);
u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
nvkm_subdev_disable(device, NVKM_ENGINE_MSPDEC, 0); nvkm_subdev_disable(device, NVKM_ENGINE_MSPDEC, 0);
...@@ -47,7 +46,7 @@ g98_devinit_disable(struct nvkm_devinit *init) ...@@ -47,7 +46,7 @@ g98_devinit_disable(struct nvkm_devinit *init)
if (!(r00154c & 0x00000040)) if (!(r00154c & 0x00000040))
nvkm_subdev_disable(device, NVKM_ENGINE_SEC, 0); nvkm_subdev_disable(device, NVKM_ENGINE_SEC, 0);
return disable; return 0ULL;
} }
static const struct nvkm_devinit_func static const struct nvkm_devinit_func
......
...@@ -68,7 +68,6 @@ gf100_devinit_disable(struct nvkm_devinit *init) ...@@ -68,7 +68,6 @@ gf100_devinit_disable(struct nvkm_devinit *init)
{ {
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
u32 r022500 = nvkm_rd32(device, 0x022500); u32 r022500 = nvkm_rd32(device, 0x022500);
u64 disable = 0ULL;
if (r022500 & 0x00000001) if (r022500 & 0x00000001)
nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0); nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);
...@@ -87,7 +86,7 @@ gf100_devinit_disable(struct nvkm_devinit *init) ...@@ -87,7 +86,7 @@ gf100_devinit_disable(struct nvkm_devinit *init)
if (r022500 & 0x00000200) if (r022500 & 0x00000200)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 1); nvkm_subdev_disable(device, NVKM_ENGINE_CE, 1);
return disable; return 0ULL;
} }
void void
......
...@@ -32,7 +32,6 @@ gm107_devinit_disable(struct nvkm_devinit *init) ...@@ -32,7 +32,6 @@ gm107_devinit_disable(struct nvkm_devinit *init)
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
u32 r021c00 = nvkm_rd32(device, 0x021c00); u32 r021c00 = nvkm_rd32(device, 0x021c00);
u32 r021c04 = nvkm_rd32(device, 0x021c04); u32 r021c04 = nvkm_rd32(device, 0x021c04);
u64 disable = 0ULL;
if (r021c00 & 0x00000001) if (r021c00 & 0x00000001)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0); nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);
...@@ -41,7 +40,7 @@ gm107_devinit_disable(struct nvkm_devinit *init) ...@@ -41,7 +40,7 @@ gm107_devinit_disable(struct nvkm_devinit *init)
if (r021c04 & 0x00000001) if (r021c04 & 0x00000001)
nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0); nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);
return disable; return 0ULL;
} }
static const struct nvkm_devinit_func static const struct nvkm_devinit_func
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment