Re: [PATCH] drm/nouveau/devinit: Convert function disable() to be void
Reviewed-by: Lyude Paul
Will push upstream in a moment
On Wed, 2023-01-25 at 20:37 +0530, Deepak R Varma wrote:
> 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: Deepak R Varma
> ---
> Please note: The change is compile build tested only.
>
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | 3 ++-
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c | 5 +
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c | 4 +---
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 4 +---
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 4 +---
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c | 4 +---
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 4 +---
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 5 +
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 2 +-
> drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 2 +-
> 10 files changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
> b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
> index dd4981708fe4..3d9319c319c6 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
> @@ -51,7 +51,8 @@ u64
> nvkm_devinit_disable(struct nvkm_devinit *init)
> {
> if (init && init->func->disable)
> - return init->func->disable(init);
> + init->func->disable(init);
> +
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
> b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
> index c224702b7bed..00df7811dd10 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
> @@ -26,13 +26,12 @@
> #include
> #include
>
> -static u64
> +static void
> g84_devinit_disable(struct nvkm_devinit *init)
> {
> struct nvkm_device *device = init->subdev.device;
> u32 r001540 = nvkm_rd32(device, 0x001540);
> u32 r00154c = nvkm_rd32(device, 0x00154c);
> - u64 disable = 0ULL;
>
> if (!(r001540 & 0x4000)) {
> nvkm_subdev_disable(device, NVKM_ENGINE_MPEG, 0);
> @@ -47,8 +46,6 @@ g84_devinit_disable(struct nvkm_devinit *init)
> nvkm_subdev_disable(device, NVKM_ENGINE_BSP, 0);
> if (!(r00154c & 0x0040))
> nvkm_subdev_disable(device, NVKM_ENGINE_CIPHER, 0);
> -
> - return disable;
> }
>
> static const struct nvkm_devinit_func
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
> b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
> index 8977483a9f42..54bee499b982 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
> @@ -26,7 +26,7 @@
> #include
> #include
>
> -static u64
> +static void
> g98_devinit_disable(struct nvkm_devinit *init)
> {
> struct nvkm_device *device = init->subdev.device;
> @@ -45,8 +45,6 @@ g98_devinit_disable(struct nvkm_devinit *init)
> nvkm_subdev_disable(device, NVKM_ENGINE_MSVLD, 0);
> if (!(r00154c & 0x0040))
> nvkm_subdev_disable(device, NVKM_ENGINE_SEC, 0);
> -
> - return 0ULL;
> }
>
> static const struct nvkm_devinit_func
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
> b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
> index 5b7cb1fe7897..5368e705e7fd 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
> @@ -63,7 +63,7 @@ gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type,
> u32 freq)
> return ret;
> }
>
> -static u64
> +static void
> gf100_devinit_disable(struct nvkm_devinit *init)
> {
> struct nvkm_device *device = init->subdev.device;
> @@ -85,8 +85,6 @@ gf100_devinit_disable(struct nvkm_devinit *init)
> nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);
> if (r022500 & 0x0200)
> nvkm_subdev_disable(device, NVKM_ENGINE_CE, 1);
> -
> - return 0ULL;
> }
>
> void
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
> b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
> index 8955af2704c7..7bcbc4895ec2 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
> @@ -26,7 +26,7 @@
> #include
> #include
>
> -u64
> +void
> gm107_devinit_disable(struct nvkm_devinit *init)
> {
> struct nvkm_device *device = init->subd
[PATCH] 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: Deepak R Varma
---
Please note: The change is compile build tested only.
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | 3 ++-
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c | 5 +
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c | 4 +---
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 4 +---
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 4 +---
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c | 4 +---
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 4 +---
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 5 +
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 2 +-
10 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
index dd4981708fe4..3d9319c319c6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
@@ -51,7 +51,8 @@ u64
nvkm_devinit_disable(struct nvkm_devinit *init)
{
if (init && init->func->disable)
- return init->func->disable(init);
+ init->func->disable(init);
+
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
index c224702b7bed..00df7811dd10 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
@@ -26,13 +26,12 @@
#include
#include
-static u64
+static void
g84_devinit_disable(struct nvkm_devinit *init)
{
struct nvkm_device *device = init->subdev.device;
u32 r001540 = nvkm_rd32(device, 0x001540);
u32 r00154c = nvkm_rd32(device, 0x00154c);
- u64 disable = 0ULL;
if (!(r001540 & 0x4000)) {
nvkm_subdev_disable(device, NVKM_ENGINE_MPEG, 0);
@@ -47,8 +46,6 @@ g84_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_BSP, 0);
if (!(r00154c & 0x0040))
nvkm_subdev_disable(device, NVKM_ENGINE_CIPHER, 0);
-
- return disable;
}
static const struct nvkm_devinit_func
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
index 8977483a9f42..54bee499b982 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
@@ -26,7 +26,7 @@
#include
#include
-static u64
+static void
g98_devinit_disable(struct nvkm_devinit *init)
{
struct nvkm_device *device = init->subdev.device;
@@ -45,8 +45,6 @@ g98_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_MSVLD, 0);
if (!(r00154c & 0x0040))
nvkm_subdev_disable(device, NVKM_ENGINE_SEC, 0);
-
- return 0ULL;
}
static const struct nvkm_devinit_func
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
index 5b7cb1fe7897..5368e705e7fd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
@@ -63,7 +63,7 @@ gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type,
u32 freq)
return ret;
}
-static u64
+static void
gf100_devinit_disable(struct nvkm_devinit *init)
{
struct nvkm_device *device = init->subdev.device;
@@ -85,8 +85,6 @@ gf100_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);
if (r022500 & 0x0200)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 1);
-
- return 0ULL;
}
void
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
index 8955af2704c7..7bcbc4895ec2 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
@@ -26,7 +26,7 @@
#include
#include
-u64
+void
gm107_devinit_disable(struct nvkm_devinit *init)
{
struct nvkm_device *device = init->subdev.device;
@@ -39,8 +39,6 @@ gm107_devinit_disable(struct nvkm_devinit *init)
nvkm_subdev_disable(device, NVKM_ENGINE_CE, 2);
if (r021c04 & 0x0001)
nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);
-
- return 0ULL;
}
static const struct nvkm_devinit_func
diff --git a/dri
