Skip to contentSkip to conversation

drm/nouveau/acr: remove unused loc variable

PATCH In review Tom Rix 2 participants 2 messages Mar 31, 2023 – Apr 7, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 drm/nouveau/acr: remove unused loc variable

clang with W=1 reports drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c:221:7: error: variable
'loc' set but not used [-Werror,-Wunused-but-set-variable]

                u32 loc, sig, cnt, *meta;
                    ^

This variable is not used so remove it.

---
 drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c +1 -2
index f36a359d4531..bd104a030243 100644
@@ -218,7 +218,7 @@ nvkm_acr_lsfw_load_sig_image_desc_v2(struct nvkm_subdev *subdev,
 		const struct firmware *hsbl;
 		const struct nvfw_ls_hsbl_bin_hdr *hdr;
 		const struct nvfw_ls_hsbl_hdr *hshdr;
-		u32 loc, sig, cnt, *meta;
+		u32 sig, cnt, *meta;
 
 		ret = nvkm_firmware_load_name(subdev, path, "hs_bl_sig", ver, &hsbl);
 		if (ret)
@@ -227,7 +227,6 @@ nvkm_acr_lsfw_load_sig_image_desc_v2(struct nvkm_subdev *subdev,
 		hdr = nvfw_ls_hsbl_bin_hdr(subdev, hsbl->data);
 		hshdr = nvfw_ls_hsbl_hdr(subdev, hsbl->data + hdr->header_offset);
 		meta = (u32 *)(hsbl->data + hshdr->meta_data_offset);
-		loc = *(u32 *)(hsbl->data + hshdr->patch_loc);
 		sig = *(u32 *)(hsbl->data + hshdr->patch_sig);
 		cnt = *(u32 *)(hsbl->data + hshdr->num_sig);
 
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Tom Rix

clang with W=1 reports drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c:221:7: error: variable
'loc' set but not used [-Werror,-Wunused-but-set-variable]

                u32 loc, sig, cnt, *meta;
                    ^

This variable is not used so remove it.

Ben, any idea if this was supposed to be used somewhere? If not:

Fixes 4b569ded09fd ("drm/nouveau/acr/ga102: initial support")
Quoted 28 lines
---
 drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c +1 -3
index f36a359d4531..bd104a030243 100644
@@ -218,7 +218,7 @@ nvkm_acr_lsfw_load_sig_image_desc_v2(struct nvkm_subdev *subdev,
                const struct firmware *hsbl;
                const struct nvfw_ls_hsbl_bin_hdr *hdr;
                const struct nvfw_ls_hsbl_hdr *hshdr;
-               u32 loc, sig, cnt, *meta;
+               u32 sig, cnt, *meta;
 
                ret = nvkm_firmware_load_name(subdev, path, "hs_bl_sig", ver, &hsbl);
                if (ret)
@@ -227,7 +227,6 @@ nvkm_acr_lsfw_load_sig_image_desc_v2(struct nvkm_subdev *subdev,
                hdr = nvfw_ls_hsbl_bin_hdr(subdev, hsbl->data);
                hshdr = nvfw_ls_hsbl_hdr(subdev, hsbl->data + hdr->header_offset);
                meta = (u32 *)(hsbl->data + hshdr->meta_data_offset);
-               loc = *(u32 *)(hsbl->data + hshdr->patch_loc);
                sig = *(u32 *)(hsbl->data + hshdr->patch_sig);
                cnt = *(u32 *)(hsbl->data + hshdr->num_sig);
 
--

2.27.0

Signature · 2 lines
Thanks,
~Nick Desaulniers