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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BD69C433EF for ; Tue, 16 Nov 2021 05:49:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A78060F14 for ; Tue, 16 Nov 2021 05:49:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237555AbhKPFwc (ORCPT ); Tue, 16 Nov 2021 00:52:32 -0500 Received: from smtpbguseast3.qq.com ([54.243.244.52]:50275 "EHLO smtpbguseast3.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237355AbhKPFvk (ORCPT ); Tue, 16 Nov 2021 00:51:40 -0500 X-QQ-mid: bizesmtp52t1637041710t27mpgep Received: from localhost.localdomain (unknown [124.126.19.250]) by esmtp6.qq.com (ESMTP) with id ; Tue, 16 Nov 2021 13:48:29 +0800 (CST) X-QQ-SSF: 01400000002000B0G000B00A0000000 X-QQ-FEAT: LXTjUhoj8YOIpxOc2c+cA9X54jxsxsuMIOnqW3Gx2JRXLsog+rFiYyBuew9sf /OPkxz6MCVoHAtapJWMXtbQ0v0XI3q7VWTbP3jmRTjLx/et5teONXAsgY5RBNzcky/qGkbl vQFgIE/HLny44q6RnmRHYFwAmfdj1vtocwTFmJfLqVYyIeIIBXbQjwX8xfy59QpagEFG+oR Fo7LMyJ3qsyQZzjz8HCxRZNCtcEus3JwdgijFxPN+hdAOp35bcHGiMDQP90qUxwLd4Djevg PSOFqiqWtJvOEKY41UZyRHs5fTA3IzVvo/yEsHFVL4h3aY0/T/gOrGSf+z//mqjSQqUxvOq IWp9KUNFD/9Tp80jhrm5zT3drVzwSZSoPLE2As+ X-QQ-GoodBg: 2 From: zhaoxiao To: linux-kernel@vger.kernel.org Cc: zhaoxiao Subject: [PATCH] drm/radeon:WARNING opportunity for max() Date: Tue, 16 Nov 2021 13:48:27 +0800 Message-Id: <20211116054827.31476-1-zhaoxiao@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign5 X-QQ-Bgrelay: 1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix following coccicheck warning: drivers/gpu/drm/radeon/r100.c:3450:26-27: WARNING opportunity for max() drivers/gpu/drm/radeon/r100.c:2812:23-24: WARNING opportunity for max() Signed-off-by: zhaoxiao --- drivers/gpu/drm/radeon/r100.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 2dd85ba1faa2..c65ee6f44af2 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2809,10 +2809,7 @@ void r100_vram_init_sizes(struct radeon_device *rdev) if (rdev->mc.aper_size > config_aper_size) config_aper_size = rdev->mc.aper_size; - if (config_aper_size > rdev->mc.real_vram_size) - rdev->mc.mc_vram_size = config_aper_size; - else - rdev->mc.mc_vram_size = rdev->mc.real_vram_size; + rdev->mc.mc_vram_size = max(config_aper_size, rdev->mc.real_vram_size); } } @@ -3447,10 +3444,7 @@ void r100_bandwidth_update(struct radeon_device *rdev) mc_latency_mclk.full += disp_latency_overhead.full + cur_latency_mclk.full; mc_latency_sclk.full += disp_latency_overhead.full + cur_latency_sclk.full; - if (mc_latency_mclk.full > mc_latency_sclk.full) - disp_latency.full = mc_latency_mclk.full; - else - disp_latency.full = mc_latency_sclk.full; + disp_latency.full = max(mc_latency_mclk.full, mc_latency_sclk.full); /* setup Max GRPH_STOP_REQ default value */ if (ASIC_IS_RV100(rdev)) -- 2.20.1