From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1EE1C48A8A1 for ; Thu, 23 Jul 2026 18:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832375; cv=none; b=Gf+nIuvaeNza9nV4lS5WN9aJCEgqhaj0nEaNKb2aeMsJ5vm1PbvRRxLqKj6zwKDmTHsPH0JOQVrqU1JKaktKVATb2dxTlOqgfA0YgKbWT55dbas6aPHNzp+F5rLObuAJHw6SDoyrXLVtIs4MenpF2SM+roG6DQUlShc/jsgHvUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832375; c=relaxed/simple; bh=SH9hRpJpnFXaJHhuWqBFaIN7XJlpoNlseJ43jS/sqis=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K3VE9O4wB5q6f61LCTngwRXhS+z2JSkq1XQB02OUy7Kr1vmcfNFVCbLWgRN5zhzXaO6WG4kGWo4aUco4fE7182j+2L7oHyfxsBDoLIXWyI8W1+HtTgwZLFStKIWOEvO9QJRQ1Y006mPMh/VpJBg5kOurJZ1FeZ7XEx8XtBzkIpo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WK6wFCWg; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WK6wFCWg" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-38ec1402b05so774468a91.2 for ; Thu, 23 Jul 2026 11:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784832362; x=1785437162; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4ythMD/8HygMBBur9HX2jCV0xO6Blk6zNXYU5eF8R0o=; b=WK6wFCWgWbxEi0a8/GX/xUFVdsSJwFde0OOQwC/ifapBkEtjwEEoCb+jcQFyR/oZRh ifc7Qeuxufs619YlAd/hpAvJYKhSLtfQvhkkf9QMo2q0HHkt4ldWdgi5tQXZhzoi4ecY TaxcPKZ8uWxN0Tq/hBpDybkRQhq4iBXxH3DRfisKulZNXA9kTTiFXs0DfV0AmFa0zbb5 yglJs4qk1kklkpOZW/kjJI/KxC710g2tzJaFvkfMyLCNV/w8AmL8gv68d4mz8SqaeOpM rU1p/ziM9YNjzDQHRN2OqKlIraALB3yumI875R22ChRYj+upCm99UvWarDqoqc9ShxaH 17yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784832362; x=1785437162; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4ythMD/8HygMBBur9HX2jCV0xO6Blk6zNXYU5eF8R0o=; b=hLF50e/ewG+IrZqB5F2Ctuvzd0+SAsP390fiN8RGdw/7iJFKTJc91AKl7kUPSpnaWq RF1S3ay/57VdNoy4HfBvy7e/2/HdPZWe7MkiFXLX7eLqQGGbwzH1J8geoKulz3X02DoZ lbfhcGSXLAriXMzCBoLwez3CKHhimgT8gbQJokRqjN8KsUYqKfGBOLSERJxxbVfGfdWI Jqrvsbdzr8O0bL6cGfRp+1G8ijYbzqwHzCJPfNCwvZ5j+ImY8vuvkfFjq2Llj/16fbJ6 DhVXXe+fKStAamIfo5WeFU0DtdSkXLsCuZFxnr+coyXBzTuNQ5FAjza0vnBLLBD5xhyU Q1ng== X-Forwarded-Encrypted: i=1; AHgh+Rqfq+saWHbZk4z0IE1lnQNunNhEDPsc+9oWh6zl1/u4qzgP0ctWwj8BJrpmrg7iiz3FlbqMPxvU3cj3KvA=@vger.kernel.org X-Gm-Message-State: AOJu0YwCGnNT4NGka3mPQSBeLPmH8iC/Fqwq+gz2e+QGtEeTSY77mURT e2s+cD/Ak7Z3w2Q+QMYKSm9sCaUg4B1V+Sy5L6XLZNltMRSZ7LeP19dm X-Gm-Gg: AR+sD13g5qtbX27bpNwLiRr3pPzGXQ2F0wnLZqBYL069CfxSmRJ36s8sXcxpQC747Au oLA4iSUhJCFPI9NkGCvAy3D9WrXFwtZ1a6jEl3RQt/ZDcUczYovc9C8XMc/LTjRDfkhOZwCeXOc NkSoT02GFdnE59f6VXIKDOwn6kow1e3c2CHyQCnZ7WUD8rlZzu3ql29kTGBBSNpNKlDPhgGaX6j W3CSo198N+T1RHn6xEjLJubmVLF+EKbXRSf1QcaFXF2PGhDOXfHvXcGpANV8Dft+t3mzIXUhUfm ewbuNVxyfjj9292Oi3+fn25ExSQX7ORHBkBPghkMk8WIjZDeZw7DI74yTviDXUIQ5hwVTnDjgdX nH12nKps1QyEcezSfUUYAMZi556eVukH8IyhT4Fr9hnPVlF9/nNPrxwc2iEfeNCf4EplmAgyF X-Received: by 2002:a17:90b:524b:b0:38e:250b:122f with SMTP id 98e67ed59e1d1-38ec6461d6dmr4058236a91.16.1784832361816; Thu, 23 Jul 2026 11:46:01 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f03af8a45sm308155a91.10.2026.07.23.11.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 11:46:01 -0700 (PDT) From: Sang-Heon Jeon To: Julia.Lawall@inria.fr, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter Cc: cocci@inria.fr, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/36] drm/radeon: remove conditional return with no effect Date: Fri, 24 Jul 2026 03:45:05 +0900 Message-ID: <20260723184538.3888637-4-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723184538.3888637-1-ekffu200098@gmail.com> References: <20260723184538.3888637-1-ekffu200098@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Both branches of the check return the same value, so the check has no effect. Remove it and return the value directly. This is the result of running the Coccinelle script from scripts/coccinelle/misc/cond_return_no_effect.cocci. Signed-off-by: Sang-Heon Jeon --- drivers/gpu/drm/radeon/ci_dpm.c | 6 +----- drivers/gpu/drm/radeon/kv_dpm.c | 30 ++++++++++-------------------- drivers/gpu/drm/radeon/si_dpm.c | 14 ++------------ 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 703848fac189..11707f5aaa6b 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -5244,11 +5244,7 @@ static int ci_set_temperature_range(struct radeon_device *rdev) ret = ci_thermal_set_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX); if (ret) return ret; - ret = ci_thermal_enable_alert(rdev, true); - if (ret) - return ret; - - return ret; + return ci_thermal_enable_alert(rdev, true); } int ci_dpm_late_enable(struct radeon_device *rdev) diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c index 1693b36fc52d..fc5252ff2a26 100644 --- a/drivers/gpu/drm/radeon/kv_dpm.c +++ b/drivers/gpu/drm/radeon/kv_dpm.c @@ -843,16 +843,11 @@ static int kv_populate_samu_table(struct radeon_device *rdev) if (ret) return ret; - ret = kv_copy_bytes_to_smc(rdev, - pi->dpm_table_start + - offsetof(SMU7_Fusion_DpmTable, SamuLevel), - (u8 *)&pi->samu_level, - sizeof(SMU7_Fusion_ExtClkLevel) * SMU7_MAX_LEVELS_SAMU, - pi->sram_end); - if (ret) - return ret; - - return ret; + return kv_copy_bytes_to_smc(rdev, + pi->dpm_table_start + offsetof(SMU7_Fusion_DpmTable, SamuLevel), + (u8 *)&pi->samu_level, + sizeof(SMU7_Fusion_ExtClkLevel) * SMU7_MAX_LEVELS_SAMU, + pi->sram_end); } @@ -902,16 +897,11 @@ static int kv_populate_acp_table(struct radeon_device *rdev) if (ret) return ret; - ret = kv_copy_bytes_to_smc(rdev, - pi->dpm_table_start + - offsetof(SMU7_Fusion_DpmTable, AcpLevel), - (u8 *)&pi->acp_level, - sizeof(SMU7_Fusion_ExtClkLevel) * SMU7_MAX_LEVELS_ACP, - pi->sram_end); - if (ret) - return ret; - - return ret; + return kv_copy_bytes_to_smc(rdev, + pi->dpm_table_start + offsetof(SMU7_Fusion_DpmTable, AcpLevel), + (u8 *)&pi->acp_level, + sizeof(SMU7_Fusion_ExtClkLevel) * SMU7_MAX_LEVELS_ACP, + pi->sram_end); } static void kv_calculate_dfs_bypass_settings(struct radeon_device *rdev) diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 4b10715f951c..4323f86000ac 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -6418,22 +6418,12 @@ static int si_set_temperature_range(struct radeon_device *rdev) ret = si_thermal_set_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX); if (ret) return ret; - ret = si_thermal_enable_alert(rdev, true); - if (ret) - return ret; - - return ret; + return si_thermal_enable_alert(rdev, true); } int si_dpm_late_enable(struct radeon_device *rdev) { - int ret; - - ret = si_set_temperature_range(rdev); - if (ret) - return ret; - - return ret; + return si_set_temperature_range(rdev); } void si_dpm_disable(struct radeon_device *rdev) -- 2.43.0