From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7375AC88E53 for ; Sat, 12 Sep 2026 15:03:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6854E10E6F8; Sat, 12 Sep 2026 15:03:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A7NDYGL/"; dkim-atps=neutral Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 99C9210E6F8 for ; Sat, 12 Sep 2026 15:03:57 +0000 (UTC) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-49b965570d7so23983275e9.0 for ; Sat, 12 Sep 2026 08:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789225436; x=1789830236; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=W/ljStNwe21EAHMT5pfp7bjQZDrUvNzZwLlTRaNK94Q=; b=A7NDYGL/lF4kSKv4AOTinCKoLUzUZjRuz12iYmf8eMNThnS7XIwFSIsCSQJpt9K5Q1 F3sYPQJAAN3gtjn3XUWYG+OdGCUCpbCZf3mRtX5wfZ9vV71Lpj3gWbU4z9J5Un2IhXhM zpYaGinQ5HH2dG5ANaGetYObLJrp7Af/zTw94YkJYZ51j5pJWpAPW7y0cuSsQ5JvnaU4 +oZ/DWiQUZ5E8opFmZ6zS3t37hLztHQbwA333sBLs9zxepwrOcn9FhFWNjJTb5PO6Q8h eJAXl/hQrSw4+oweDJ17R7cpFFsxVmPFZGIVMnhfCCwZV9fqR6EqRCI/D4gKSV2L9RgD /rbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789225436; x=1789830236; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=W/ljStNwe21EAHMT5pfp7bjQZDrUvNzZwLlTRaNK94Q=; b=VyHzbCXJoYeS/nCBb757Jo5DGiB9raiVEkU3oiaFFHmSTcr8x2acXxl71zQQ62P3yU mPG724AZFl0IYzXpXEAkjheTSEHrSpP7yA2A5CMqzKD6Y7iIhdVY6EmTI3d/n9e0pnyk qeHboEP2nmKhwdjbhMef9UkrpzefKfkfzpbMQ/BgzLRO/pKv3bVFLEPYHIaUhUVoXz8Z D9h34h5pU7sI59BGA+NFEZab1N8JOh5E2oy2thJwadx6dhCItsrRxdXtbd/Fn+exyLCi Ib/fjM5/CiNazGAEXaRCv4RHaJng1XcGXuchb7JanynVG8Yjnd+gw4YYsnN8H2jWfyRo Domw== X-Forwarded-Encrypted: i=1; AKwUvBx0W9mw24rtIjfnLUhtA4GyQE5Kt++Lkbs0iQGd+fQ1vVw1lrRTvhSGgyVjA14jGmBVv74a+bYCMx4=@lists.freedesktop.org X-Gm-Message-State: AFuF++kV1afPDCp1gSAc4sEdK8gSkxLEmtdthSoLCuma9WlL5idZj0tt 8aLS94mlgLswPUOKItElV9I3pM+3RoYWkCoHbcYOiL+2b7T65dWPdtx2 X-Gm-Gg: AYBFou1Aa9wTAkCttPmBMuZ52DK5sLBts/zZGo7NrwBgZuHe2KkrHopo3S773CYvF2J 4yqIs3xc67HXm2XlsP8SddV6oIXmoddmvBtT76befh0de3dEiJMMXi/QRg4UmxltPP72gBHv+AD z/KMYdHqOzJihNzatOGzEiTPRNEftoMQ+SRDkkVgGwEoQh2UCArQDeH501mgUqUXVRNhEb638D4 qtyMHdDWm19eStJ+GUdegTD20dfB3ZgSB9fYT9g++yjAmyipuImgorprilDMZPXQDyiAnE+I7Ao nm7tT+E8741DTKB3ZvBIKdbAcEshIrxgmo5J5rdXrEdxXPat9hLrsLFRvQaY/MsN1H37jaAQDh0 lYXGuxbXtGbMSqab0uPSoubbCPtu2KFS0Si2d8gRk96xrvpG8YGBI9fODgdYOx1e+gLPiYalKsC HEAvnkE9w0LPnviejwrwq+a3rbAhasNRK36/kzSChACf2N4br9rZw7oY496B823IYVBa+s2RKvm MAstQ== X-Received: by 2002:a05:600c:3b8c:b0:49e:73d3:78ab with SMTP id 5b1f17b1804b1-49e73d379e4mr9568925e9.0.1789225435447; Sat, 12 Sep 2026 08:03:55 -0700 (PDT) Received: from localhost ([2c0f:3d00:6be:8900:ce5e:9212:ea4b:f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e6420de77sm69964935e9.3.2026.09.12.08.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 08:03:54 -0700 (PDT) Date: Sat, 12 Sep 2026 18:03:51 +0300 From: Dan Carpenter To: Asad Kamal Cc: Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , David Airlie , Simona Vetter , Hawking Zhang , Lijo Lazar , Likun Gao , Sonny Jiang , Gabriel Almeida , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] drm/amdgpu: Remove redundant mode2 restore check Message-ID: <94ccd0e0f47be9ec1985cbc786093c01d7693aa5.1789224159.git.error27@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The "r" variable is checked twice. We already know it is zero/success at this point so there is no need to check again. Delete the redundant check and pull the code in a tab. Fixes: 208e5d4b3f1e2 ("drm/amd/amdgpu: Add soc_v1_0 reset handler") Assisted-by: Codex:GPT-5 Signed-off-by: Dan Carpenter --- In retrospect, I probably could have deleted these tabs without AI help. drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c index 757da0a30fdc..39a748e38e9c 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/soc_v1_0.c @@ -729,19 +729,16 @@ soc_v1_0_mode2_restore_hwcontext(struct amdgpu_reset_control *reset_ctl, amdgpu_ras_resume(tmp_adev); - if (!r) { - amdgpu_set_init_level(tmp_adev, - AMDGPU_INIT_LEVEL_DEFAULT); - amdgpu_irq_gpu_reset_resume_helper(tmp_adev); + amdgpu_set_init_level(tmp_adev, AMDGPU_INIT_LEVEL_DEFAULT); + amdgpu_irq_gpu_reset_resume_helper(tmp_adev); - r = amdgpu_ib_ring_tests(tmp_adev); - if (r) { - dev_err(tmp_adev->dev, - "ib ring test failed (%d).\n", r); - r = -EAGAIN; - tmp_adev->asic_reset_res = r; - goto end; - } + r = amdgpu_ib_ring_tests(tmp_adev); + if (r) { + dev_err(tmp_adev->dev, + "ib ring test failed (%d).\n", r); + r = -EAGAIN; + tmp_adev->asic_reset_res = r; + goto end; } } -- 2.53.0