[PATCH] drm/amdgpu: Correct if identation that causes GCC warning

Li, Candice Candice.Li at amd.com
Wed Jun 1 16:41:34 UTC 2022


[AMD Official Use Only - General]

Hi Rodrigo,

Sorry, my bad! Thanks for the fix, but only adjust the indentation will miss another code path for amdgpu_ras_block_late_init.
Let me submit a new one to fix it.



Thanks,
Candice

-----Original Message-----
From: Siqueira, Rodrigo <Rodrigo.Siqueira at amd.com> 
Sent: Wednesday, June 1, 2022 10:14 PM
To: amd-gfx at lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Li, Candice <Candice.Li at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>
Subject: [PATCH] drm/amdgpu: Correct if identation that causes GCC warning

GCC is complaining about misleading indentation:

error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
  603 |  if (r)

This commit adjusts the commit indentation.

Cc: Candice Li <candice.li at amd.com>
Cc: Hawking Zhang <Hawking.Zhang at amd.com>

Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index 99c1a2d3dae8..e1f4c5f30645 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -599,9 +599,9 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
 		if (!amdgpu_persistent_edc_harvesting_supported(adev))
 			amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
 
-	r = amdgpu_ras_block_late_init(adev, ras_block);
-	if (r)
-		return r;
+		r = amdgpu_ras_block_late_init(adev, ras_block);
+		if (r)
+			return r;
 
 		r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0);
 		if (r)
-- 
2.25.1


More information about the amd-gfx mailing list