From patchwork Tue Nov 24 10:42:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1405441 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CgLGw0cnQz9sT6; Tue, 24 Nov 2020 21:43:52 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1khVnV-00038L-Qu; Tue, 24 Nov 2020 10:43:45 +0000 Received: from mail-pf1-f170.google.com ([209.85.210.170]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1khVnT-000341-01 for kernel-team@lists.ubuntu.com; Tue, 24 Nov 2020 10:43:43 +0000 Received: by mail-pf1-f170.google.com with SMTP id y7so18084740pfq.11 for ; Tue, 24 Nov 2020 02:43:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z+n0yKXxuZNL/3AA03FZK5LTfkMJuZSKyejRiwDe2+A=; b=ILAMu2GmMIeqXTDg5PYBEhnR7TwPJFphV1mDxlQA4VpNIbMh0GWoWxKJd5OD9fOjNX AREhDPQXqAnvviHkDaaKaw81EyCMfiok9w2ch+lkggZxCqBIHoKUY3EzhgR6Q08Zb+ce GzMcPM1OSYiqGLUyqv7eg0Xq6XUeVC3gIJDkgMvsi9DqBhIjhDmPYulnAo2JfHD3N+Mq OyFA4vnj4MtY1rk0gyLQ6OnORoUVDVkZEyQ8mXe/aoU01HfvjJGCeTj7kE2uWGopqfxZ ddGJeFvlnfqBWmtHSVm2ydqgiBDo2UTj3kVrckZcVllKSYLtMEwzS1JrhozZm2TmMFYh M6BA== X-Gm-Message-State: AOAM531qlXs1YFvVNiE87gWIXXcRicZRzgCxWM4FI18G5g3oNIxgutYH AufBMjGw9R21RELWjSbHS5sFBOFNY9vfFw== X-Google-Smtp-Source: ABdhPJzigLTYE1ORnj7G5VAKVhSht40CqMkR5gPUUdwV0HR2oLlK+Me0nWuQxWxKpSol1MCRfpsN2A== X-Received: by 2002:a17:90a:4482:: with SMTP id t2mr4110447pjg.44.1606214619412; Tue, 24 Nov 2020 02:43:39 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id c6sm2646932pjr.55.2020.11.24.02.43.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 02:43:38 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 09/38][SRU][G/H] drm/i915: Replace some hand rolled max()s Date: Tue, 24 Nov 2020 18:42:44 +0800 Message-Id: <20201124104313.421860-10-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201124104313.421860-1-vicamo.yang@canonical.com> References: <20201124104313.421860-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.170; envelope-from=vicamo@gmail.com; helo=mail-pf1-f170.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ville Syrjälä BugLink: https://bugs.launchpad.net/bugs/1903969 Use max() instead of hand rolling it. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20200512174145.3186-8-ville.syrjala@linux.intel.com Reviewed-by: Manasi Navare (cherry picked from commit e2db55244e0ff2c03a864a49276754ad840e338f) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 573f93779449..b9e4ee2dbddc 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -59,13 +59,8 @@ void intel_dp_get_adjust_train(struct intel_dp *intel_dp, u8 preemph_max; for (lane = 0; lane < intel_dp->lane_count; lane++) { - u8 this_v = drm_dp_get_adjust_request_voltage(link_status, lane); - u8 this_p = drm_dp_get_adjust_request_pre_emphasis(link_status, lane); - - if (this_v > v) - v = this_v; - if (this_p > p) - p = this_p; + v = max(v, drm_dp_get_adjust_request_voltage(link_status, lane)); + p = max(p, drm_dp_get_adjust_request_pre_emphasis(link_status, lane)); } preemph_max = intel_dp->preemph_max(intel_dp);