From patchwork Mon Apr 15 19:34:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13630633 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A0B58C00A94 for ; Mon, 15 Apr 2024 19:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dXGlWf33eh7qoSHwDOOoLateIdhPmbrFQM90TPlw4aU=; b=bWf6E5y9UE+Wl2 /7iQ3UaqiV9M3zRGIRIdNHQiZIw7Ad/bvJ47s0x7Aw10UPBpNm9+iPszkh4JVFlZkAoJ2Kmbz3mDu kOs5g24AnbV/w57DI3RUXGByFvW9RrLVHk3WjjqrrJqY0Pb9GOEr4OUABjI7OjfGjkWth1mJd4+fC Ia9tcYZeKWJcLG3vdgTP34Q/hrCrbHoxgE9uxC2nmjRCEkKzUcOAVegxjCo5mTPCQ/sK9Xu8/6B2s DbaYBlnkPVDX1/cJCsmD/UNEYNWLAFUp/CJ7ohc7kJtLH16QzYHNfFZldH5EII8NBe4qaOo3pGgKs 5aq5xD6+019RRPrC3zag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwS9F-00000009ds2-1TTt; Mon, 15 Apr 2024 19:37:49 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwS6V-00000009cDo-15UZ for linux-arm-kernel@bombadil.infradead.org; Mon, 15 Apr 2024 19:34:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=CefUC+YxzIgWNX8CpaofkTMnPwq7GRiYus7oOXvNDPA=; b=B+QlthqxZVtkaJkC1jNBGmcGhX oYbWWkceCtk+9FsJ3FypI8JK/K4mc1UhQy9mthOs7tt7YtcvQtv/TUwJcI3q1qnl9v/j0HEUEeF8f 1sudjgMXnTP5AjxObbzymlSmI/BmU3PCGj+sUTaf01X8n1kmdDeHzqY1jxh+2RFgoBxtfTVFmUflg ptWmAAyObdzNI6+biWJ/WE9R7EOzPVG6y9WtVFzf35OXJLoJbZmcL6rKfrLSp9wDRtnZYmTH9YW6w yjHjrbkY07ylosjYAduYbvWyJRijYIB0Bns5n87ExkC9c2XnG2USfT/j9MvChsAvXr8XHw+Pbnbnv 7NAYrHbw==; Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwS6F-0000000Aigw-3j34 for linux-arm-kernel@lists.infradead.org; Mon, 15 Apr 2024 19:34:53 +0000 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-78edc3e7cd9so133687585a.1 for ; Mon, 15 Apr 2024 12:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1713209682; x=1713814482; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=CefUC+YxzIgWNX8CpaofkTMnPwq7GRiYus7oOXvNDPA=; b=hFw6wclFwy1pyO5pPFOTfhFW/TwFmXdbFGLEp2Nzevm2WcFmQE0BSwoLl3IsRkAAJe FvkqWMtLzvfiaAzKh7hbQfNVL2MNUCDIKEyJuLIAbt91Rn+LX6FuklS3KY1gvh+kEsIp 7YC0w+bpyvhTZXxsp6TRmOAe0YwjkJiPSt5hI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713209682; x=1713814482; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CefUC+YxzIgWNX8CpaofkTMnPwq7GRiYus7oOXvNDPA=; b=IeoV9pkBgp+ptkixESAc7Wi/8jJrWUK4Ko+EtvYhE/zfn8DnUlHG5zFfzYbSoSZjOF T/m1yw39GFZaZk6t5kzjl83hVsqzU5rYq1p7u67P5lgKidAx216qgYAqWJOZmlCbGGoD xmX7bQRU1i+Gs72P+ULcGF0iofkWavfwCxfvJLnLoBkhsFtf6BW+D08n/9Y/UblB6DQG u7EW1br7kCKCalaMzASt2Z4oieVHKYfsCqWtP7lFAPPBFmoi0GpBq97ZraYfBf92/Tv0 lwKPl1j9q04NxxWxxEYhQI7eH1iEmwzPMQa/pk3/aCdL+tgeGBmPZIeGWpHxhRoaq86P nuiA== X-Forwarded-Encrypted: i=1; AJvYcCWGJaWMrfOojlijZ+zMfdMLO9wb+5lK73Bb6B26uxpttXd1x/ap8SvEdsC+MmF2QkCLpTADK/Mb2LtweR4vVHLX7k7br+fRez+PVgRvHeJGYX3IH1E= X-Gm-Message-State: AOJu0YxwAficUWFLP4P65B7E1ASoRxGaGBCoKe6AiqTjBxTrayWCO6V8 nn2CSkEjjHCDwTQbfW1Gx/TTLuvKrBYYksnXeHC0VvpGDr6ujfeFQjBdgQe1pw== X-Google-Smtp-Source: AGHT+IE+3KdNYzINGLb3rrR3dbCdrA74Ddhjd2P3YHrcD0Jca/9uMwZH+j5PP3pBwpJxZ8tf3OsdUQ== X-Received: by 2002:a05:620a:5a6e:b0:78d:6786:7637 with SMTP id wx46-20020a05620a5a6e00b0078d67867637mr11767547qkn.71.1713209682098; Mon, 15 Apr 2024 12:34:42 -0700 (PDT) Received: from denia.c.googlers.com (114.152.245.35.bc.googleusercontent.com. [35.245.152.114]) by smtp.gmail.com with ESMTPSA id s26-20020ae9f71a000000b0078d3b54eb76sm6718055qkg.78.2024.04.15.12.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 12:34:41 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 15 Apr 2024 19:34:30 +0000 Subject: [PATCH 13/35] media: common: saa7146: Use min macro MIME-Version: 1.0 Message-Id: <20240415-fix-cocci-v1-13-477afb23728b@chromium.org> References: <20240415-fix-cocci-v1-0-477afb23728b@chromium.org> In-Reply-To: <20240415-fix-cocci-v1-0-477afb23728b@chromium.org> To: Martin Tuma , Mauro Carvalho Chehab , Laurent Pinchart , Hans Verkuil , Hugues Fruchet , Alain Volmat , Maxime Coquelin , Alexandre Torgue , Paul Kocialkowski , Greg Kroah-Hartman , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Sakari Ailus , Thierry Reding , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Matthias Brugger , AngeloGioacchino Del Regno , Hans Verkuil , Sergey Kozlov , Abylay Ospan , Ezequiel Garcia , Dmitry Osipenko , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Bjorn Andersson , Konrad Dybcio , Benjamin Mugnier , Sylvain Petinot , Jacopo Mondi , Kieran Bingham , Laurent Pinchart , =?utf-8?q?Ni?= =?utf-8?q?klas_S=C3=B6derlund?= , Pavel Machek Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240415_203447_432487_0CE35383 X-CRM114-Status: GOOD ( 14.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Simplifies the code. Found by cocci: drivers/media/common/saa7146/saa7146_hlp.c:125:36-37: WARNING opportunity for min() drivers/media/common/saa7146/saa7146_hlp.c:154:41-42: WARNING opportunity for min() drivers/media/common/saa7146/saa7146_hlp.c:286:35-36: WARNING opportunity for min() drivers/media/common/saa7146/saa7146_hlp.c:289:35-36: WARNING opportunity for min() Signed-off-by: Ricardo Ribalda Reviewed-by: Bryan O'Donoghue --- drivers/media/common/saa7146/saa7146_hlp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/common/saa7146/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c index 7569d8cdd4d8..fe3348af543e 100644 --- a/drivers/media/common/saa7146/saa7146_hlp.c +++ b/drivers/media/common/saa7146/saa7146_hlp.c @@ -122,7 +122,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev, xacm = 0; /* set horizontal filter parameters (CXY = CXUV) */ - cxy = hps_h_coeff_tab[( (xpsc - 1) < 63 ? (xpsc - 1) : 63 )].hps_coeff; + cxy = hps_h_coeff_tab[min(xpsc - 1, 63)].hps_coeff; cxuv = cxy; /* calculate and set horizontal fine scale (xsci) */ @@ -151,7 +151,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev, xacm = 0; /* get best match in the table of attenuations for horizontal scaling */ - h_atten = hps_h_coeff_tab[( (xpsc - 1) < 63 ? (xpsc - 1) : 63 )].weight_sum; + h_atten = hps_h_coeff_tab[min(xpsc - 1, 63)].weight_sum; for (i = 0; h_attenuation[i] != 0; i++) { if (h_attenuation[i] >= h_atten) @@ -283,10 +283,10 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field } /* get filter coefficients for cya, cyb from table hps_v_coeff_tab */ - cya_cyb = hps_v_coeff_tab[ (yacl < 63 ? yacl : 63 ) ].hps_coeff; + cya_cyb = hps_v_coeff_tab[min(yacl, 63)].hps_coeff; /* get best match in the table of attenuations for vertical scaling */ - v_atten = hps_v_coeff_tab[ (yacl < 63 ? yacl : 63 ) ].weight_sum; + v_atten = hps_v_coeff_tab[min(yacl, 63)].weight_sum; for (i = 0; v_attenuation[i] != 0; i++) { if (v_attenuation[i] >= v_atten)