Commit da2b1a0a authored by Deepak R Varma's avatar Deepak R Varma Committed by Lyude Paul

drm/nouveau/devinit: Convert function disable() to be void

The current design of callback function disable() of struct
nvkm_devinit_func is defined to return a u64 value. In its implementation
in the driver modules, the function always returns a fixed value 0. Hence
the design and implementation of this function should be enhanced to return
void instead of a fixed value. This change also eliminates untouched
return variables.

The change is identified using the returnvar.cocci Coccinelle semantic
patch script.
Signed-off-by: default avatarDeepak R Varma <drv@mailo.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/Y9FFoooIXjlr+UP1@ubun2204.myguest.virtualbox.org
parent 8d71c78e
...@@ -51,7 +51,8 @@ u64 ...@@ -51,7 +51,8 @@ u64
nvkm_devinit_disable(struct nvkm_devinit *init) nvkm_devinit_disable(struct nvkm_devinit *init)
{ {
if (init && init->func->disable) if (init && init->func->disable)
return init->func->disable(init); init->func->disable(init);
return 0; return 0;
} }
......
...@@ -26,13 +26,12 @@ ...@@ -26,13 +26,12 @@
#include <subdev/bios.h> #include <subdev/bios.h>
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
static u64 static void
g84_devinit_disable(struct nvkm_devinit *init) g84_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_MPEG, 0); nvkm_subdev_disable(device, NVKM_ENGINE_MPEG, 0);
...@@ -47,8 +46,6 @@ g84_devinit_disable(struct nvkm_devinit *init) ...@@ -47,8 +46,6 @@ g84_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_BSP, 0); nvkm_subdev_disable(device, NVKM_ENGINE_BSP, 0);
if (!(r00154c & 0x00000040)) if (!(r00154c & 0x00000040))
nvkm_subdev_disable(device, NVKM_ENGINE_CIPHER, 0); nvkm_subdev_disable(device, NVKM_ENGINE_CIPHER, 0);
return disable;
} }
static const struct nvkm_devinit_func static const struct nvkm_devinit_func
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <subdev/bios.h> #include <subdev/bios.h>
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
static u64 static void
g98_devinit_disable(struct nvkm_devinit *init) g98_devinit_disable(struct nvkm_devinit *init)
{ {
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
...@@ -45,8 +45,6 @@ g98_devinit_disable(struct nvkm_devinit *init) ...@@ -45,8 +45,6 @@ g98_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_MSVLD, 0); nvkm_subdev_disable(device, NVKM_ENGINE_MSVLD, 0);
if (!(r00154c & 0x00000040)) if (!(r00154c & 0x00000040))
nvkm_subdev_disable(device, NVKM_ENGINE_SEC, 0); nvkm_subdev_disable(device, NVKM_ENGINE_SEC, 0);
return 0ULL;
} }
static const struct nvkm_devinit_func static const struct nvkm_devinit_func
......
...@@ -63,7 +63,7 @@ gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) ...@@ -63,7 +63,7 @@ gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
return ret; return ret;
} }
static u64 static void
gf100_devinit_disable(struct nvkm_devinit *init) gf100_devinit_disable(struct nvkm_devinit *init)
{ {
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
...@@ -85,8 +85,6 @@ gf100_devinit_disable(struct nvkm_devinit *init) ...@@ -85,8 +85,6 @@ gf100_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0); nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);
if (r022500 & 0x00000200) if (r022500 & 0x00000200)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 1); nvkm_subdev_disable(device, NVKM_ENGINE_CE, 1);
return 0ULL;
} }
void void
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <subdev/bios.h> #include <subdev/bios.h>
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
u64 void
gm107_devinit_disable(struct nvkm_devinit *init) gm107_devinit_disable(struct nvkm_devinit *init)
{ {
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
...@@ -39,8 +39,6 @@ gm107_devinit_disable(struct nvkm_devinit *init) ...@@ -39,8 +39,6 @@ gm107_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 2); nvkm_subdev_disable(device, NVKM_ENGINE_CE, 2);
if (r021c04 & 0x00000001) if (r021c04 & 0x00000001)
nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0); nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);
return 0ULL;
} }
static const struct nvkm_devinit_func static const struct nvkm_devinit_func
......
...@@ -62,7 +62,7 @@ gt215_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) ...@@ -62,7 +62,7 @@ gt215_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
return ret; return ret;
} }
static u64 static void
gt215_devinit_disable(struct nvkm_devinit *init) gt215_devinit_disable(struct nvkm_devinit *init)
{ {
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
...@@ -80,8 +80,6 @@ gt215_devinit_disable(struct nvkm_devinit *init) ...@@ -80,8 +80,6 @@ gt215_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_MSVLD, 0); nvkm_subdev_disable(device, NVKM_ENGINE_MSVLD, 0);
if (!(r00154c & 0x00000200)) if (!(r00154c & 0x00000200))
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0); nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);
return 0ULL;
} }
static u32 static u32
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <subdev/bios.h> #include <subdev/bios.h>
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
static u64 static void
mcp89_devinit_disable(struct nvkm_devinit *init) mcp89_devinit_disable(struct nvkm_devinit *init)
{ {
struct nvkm_device *device = init->subdev.device; struct nvkm_device *device = init->subdev.device;
...@@ -46,8 +46,6 @@ mcp89_devinit_disable(struct nvkm_devinit *init) ...@@ -46,8 +46,6 @@ mcp89_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_VIC, 0); nvkm_subdev_disable(device, NVKM_ENGINE_VIC, 0);
if (!(r00154c & 0x00000200)) if (!(r00154c & 0x00000200))
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0); nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);
return 0;
} }
static const struct nvkm_devinit_func static const struct nvkm_devinit_func
......
...@@ -77,17 +77,14 @@ nv50_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) ...@@ -77,17 +77,14 @@ nv50_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
return 0; return 0;
} }
static u64 static void
nv50_devinit_disable(struct nvkm_devinit *init) nv50_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);
u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) if (!(r001540 & 0x40000000))
nvkm_subdev_disable(device, NVKM_ENGINE_MPEG, 0); nvkm_subdev_disable(device, NVKM_ENGINE_MPEG, 0);
return disable;
} }
void void
......
...@@ -23,7 +23,7 @@ int gf100_devinit_ctor(struct nvkm_object *, struct nvkm_object *, ...@@ -23,7 +23,7 @@ int gf100_devinit_ctor(struct nvkm_object *, struct nvkm_object *,
int gf100_devinit_pll_set(struct nvkm_devinit *, u32, u32); int gf100_devinit_pll_set(struct nvkm_devinit *, u32, u32);
void gf100_devinit_preinit(struct nvkm_devinit *); void gf100_devinit_preinit(struct nvkm_devinit *);
u64 gm107_devinit_disable(struct nvkm_devinit *); void gm107_devinit_disable(struct nvkm_devinit *);
int gm200_devinit_post(struct nvkm_devinit *, bool); int gm200_devinit_post(struct nvkm_devinit *, bool);
void gm200_devinit_preos(struct nv50_devinit *, bool); void gm200_devinit_preos(struct nv50_devinit *, bool);
......
...@@ -12,7 +12,7 @@ struct nvkm_devinit_func { ...@@ -12,7 +12,7 @@ struct nvkm_devinit_func {
u32 (*mmio)(struct nvkm_devinit *, u32); u32 (*mmio)(struct nvkm_devinit *, u32);
void (*meminit)(struct nvkm_devinit *); void (*meminit)(struct nvkm_devinit *);
int (*pll_set)(struct nvkm_devinit *, u32 type, u32 freq); int (*pll_set)(struct nvkm_devinit *, u32 type, u32 freq);
u64 (*disable)(struct nvkm_devinit *); void (*disable)(struct nvkm_devinit *);
}; };
void nvkm_devinit_ctor(const struct nvkm_devinit_func *, struct nvkm_device *, void nvkm_devinit_ctor(const struct nvkm_devinit_func *, struct nvkm_device *,
......
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