Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Guo Zhengkui <guozhengkui@vivo.com>
To:     Ben Skeggs <bskeggs@redhat.com>, Karol Herbst <kherbst@redhat.com>,
        Lyude Paul <lyude@redhat.com>, David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Guo Zhengkui <guozhengkui@vivo.com>,
        dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Cc:     zhengkui_guo@outlook.com
Subject: [PATCH] drm/nouveau/devinit: fix returnvar.cocci warnings
Date:   Thu,  5 May 2022 00:09:29 +0800
Message-Id: <20220504161003.9245-1-guozhengkui@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ip4xu6lPJ2d4CJDreB7LGixVTDDZIyuN//ykpG35A/EM+jSbfn11LzbgNfZL?=
 =?us-ascii?Q?xbGWIZS0wNj2ZLW3G6DYe5HbWUf5saI3T8YQldNsrAeqJltJ+WOgiymSuuLv?=
 =?us-ascii?Q?qUi8m+ZP5bO8Y3zdkeZabb+U+9oWXnfcq8IU5pWgDnCtjx3Si6b6Vpcu13y0?=
 =?us-ascii?Q?N7O63IfZQH4L1wWeI+y46kxgshIb7OC1Lb/jvsv9Sc7JiD4Uve5XPD5Jai3Y?=
 =?us-ascii?Q?hjOV3RFWEAcnDO3ZXRQVL+z9v3VDDoTgSm0bmobhCfJ+eTmPfDgM3fPvae2I?=
 =?us-ascii?Q?ckKwb1/ssAE8tkn+IrjV3xUbk6DRKAG1oyj3n4PNpVDQcqE20UhztRIzdRNa?=
 =?us-ascii?Q?VvlkeC8P7rzqtlI49yCDsDDctk+cpM/xbhRB0DrXoUjLjM00XOEcHTTZjCPW?=
 =?us-ascii?Q?pFf2NX43l5IPqeVYC28D7KayFOrmhmhi2bHtYdw8zSQ9DNNhh3T7lUcLW4AK?=
 =?us-ascii?Q?y+JC1nuExhh9cgdvGjIhZYT89Nk64Yt+haTGKcDjNp1WFMJ0POxINJek/ivz?=
 =?us-ascii?Q?rjSt9UqudVug2NZ7A7no80Z1m6M+mTt+uy3S9A6eSExq06FAAzyeXhQmWxmJ?=
 =?us-ascii?Q?dhyhAvV5n2R8o+M6q+iten4nFalt1auCF8cz7ILFKAqWfqdBXUFdazdlldvF?=
 =?us-ascii?Q?rvX7VrUMfwsEfqCg68S6niNcD7y9U8gsOH+CcAx8PgHeTGAlZt+IGjkyuiEi?=
 =?us-ascii?Q?eXrMqMsTkb3qr+ge5EYa102lMYxS7xtzG7tDj5z78Gl1Ogy73nP4ecE8o9rc?=
 =?us-ascii?Q?85AavPxbE6CPC3jiH+3ZeQhr7HHM51q/kfJqz4xgcZcIB1PYPtSlgttrn3O/?=
 =?us-ascii?Q?BhZyjOTmIG4P7j9WhkXLdVcBcdlf4wUhw6U0jrckbD/c7qSycFKS5cKTY7US?=
 =?us-ascii?Q?H1MRFM+XvHDnmArw+lH/oRieS/M7veFbhi2i9Z7tTh1hfjQCWMsQ6C+VFQZ9?=
 =?us-ascii?Q?LCldhWlD+/5Obl31efOgFsJHzI4jI61h+xLalw/i42W8ec4sertjWB+lrJp9?=
 =?us-ascii?Q?qyaGleuhGTfJA+Lu3l4OBeaM33folvgGjDj7avIepkuiHk5UC5FilX53BbrJ?=
 =?us-ascii?Q?TXg2a5Yx/dJugpJBgAirmafll4Kz61IwjrcRuQpRyBvj4ARAfT00AUEL2NGG?=
 =?us-ascii?Q?TNaYmiEaZ/GiKlpxTCEdKe88tKYKxmIka9yaA8gN2WWqkoxZ/pwQMwm51KAR?=
 =?us-ascii?Q?LVQgnhgbEvMEXJjoOhRZ0GFpcXuofsGjJl7HAZxFv2YAwJi0BWdhHFiKcpzX?=
 =?us-ascii?Q?XFGlo4dLLi+f2yGMXLt4ila7jZ606P+q5oHIaeeI7PIh1BzaHbJ739hiHso7?=
 =?us-ascii?Q?C51WGinKAWUXmGbwEDwWsXO56JSxeqcESN1SwOtxlE1nUKZqq0EmYYx5n5RU?=
 =?us-ascii?Q?B+a3+B5VAHveKuy9vswj99zKUdu5T8kMTqDc1iI7W8H1E8tgFzWA4cFPZPNI?=
 =?us-ascii?Q?o+NqooxXPBWLk/2gU1198FFPJWgl9IefGNywytHYvsAAIBAQAswRuB7c1XZp?=
 =?us-ascii?Q?EBtVEEGdxJ9b3mF8g+utsuU4MFtPnphw3kSqPQrEdXwnIFQaqEQxucrRc/jV?=
 =?us-ascii?Q?la7w7bfznFHv0oan9C3sz/pQpfnrDjCo4gg5aF2eOBgGf7DqkoKq858nJ8SA?=
 =?us-ascii?Q?hnXyIPLxxEE0m4CEEkftPy8G815+YZhwZTNWb7KYACeHjgyluc+VVu6yFOIJ?=
 =?us-ascii?Q?rNXcDN40nA1e56+2Jh575LWvhCGRg9QRBpDNIdIK6PURpPqzVzX57h6cGr6J?=
 =?us-ascii?Q?y9af3QCrOQ=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9203220c-30ce-4a91-997c-08da2de8bf06
X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 16:11:28.9389
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: y0Ov5RfxE4Mey0+rewuB0ZjG5fk4KJybKkWUtc+wWGq/kw8aiTx8+xphPLrdKYYFvUkEOF0m65yhiNmIFVoJBw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4487
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c   | 3 +--
 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 3 +--
 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
index 05729ca19e9a..8977483a9f42 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
@@ -32,7 +32,6 @@ g98_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 & 0x40000000)) {
 		nvkm_subdev_disable(device, NVKM_ENGINE_MSPDEC, 0);
@@ -47,7 +46,7 @@ g98_devinit_disable(struct nvkm_devinit *init)
 	if (!(r00154c & 0x00000040))
 		nvkm_subdev_disable(device, NVKM_ENGINE_SEC, 0);
 
-	return disable;
+	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 051cfd6a5caf..5b7cb1fe7897 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
@@ -68,7 +68,6 @@ gf100_devinit_disable(struct nvkm_devinit *init)
 {
 	struct nvkm_device *device = init->subdev.device;
 	u32 r022500 = nvkm_rd32(device, 0x022500);
-	u64 disable = 0ULL;
 
 	if (r022500 & 0x00000001)
 		nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);
@@ -87,7 +86,7 @@ gf100_devinit_disable(struct nvkm_devinit *init)
 	if (r022500 & 0x00000200)
 		nvkm_subdev_disable(device, NVKM_ENGINE_CE, 1);
 
-	return disable;
+	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 4323732a3cb2..8955af2704c7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
@@ -32,7 +32,6 @@ gm107_devinit_disable(struct nvkm_devinit *init)
 	struct nvkm_device *device = init->subdev.device;
 	u32 r021c00 = nvkm_rd32(device, 0x021c00);
 	u32 r021c04 = nvkm_rd32(device, 0x021c04);
-	u64 disable = 0ULL;
 
 	if (r021c00 & 0x00000001)
 		nvkm_subdev_disable(device, NVKM_ENGINE_CE, 0);
@@ -41,7 +40,7 @@ gm107_devinit_disable(struct nvkm_devinit *init)
 	if (r021c04 & 0x00000001)
 		nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);
 
-	return disable;
+	return 0ULL;
 }
 
 static const struct nvkm_devinit_func
-- 
2.20.1