From patchwork Fri Apr 19 09:48:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13636104 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 45B5BC4345F for ; Fri, 19 Apr 2024 09:53:47 +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=TcV+/bOCNQ3YKqSCP7FnHRo7wTgBzsfzCZysCCqaVEk=; b=U348AP1Lx4R3je PXNSBdTUHhN7G7o7s27nL4sjnmprvyXhveFwZobcy69RvPz7QCyajUnohpMug++ld75U84IeoaScm PaDye+OtxmZfm9DviKR24iacGKAFcUklPig+581BIfAoimcwmcyl4eKRLWW85ZvOgnIumHe3bAWzx kYencpq9qVQCv/XwdcWvwwhnD6m2dllqg4XH1oAya1lGNaMrbjYiz4993gEWC8NhSCET8mc+7VZ7P MvOtZ++URvvF/kUdVzzFSiXsEKro1xwz+tCfD5zXsdRstJBd3iuogoFDADbPXVTN6ym5FTIl4y99a KW7waS41fgQJTUcppevQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxkw4-00000005BNQ-226T; Fri, 19 Apr 2024 09:53:36 +0000 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxksC-000000058yP-3jLQ for linux-arm-kernel@lists.infradead.org; Fri, 19 Apr 2024 09:49:42 +0000 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-78f049ddd7dso121324585a.1 for ; Fri, 19 Apr 2024 02:49:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1713520176; x=1714124976; 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=o87/x+VFy7QdGpzFKB0wOlVC4lrWjoCcMvbEo+2HMvU=; b=e/8Z1mutqE3uIAMWCgdn9L3nvZ+mFWqYul5xiJvBtNNDl3MPOcU4/+YIva1QUi/T2u 0YzqNnX73/e3J3hsh/NbZvO1I1Ajh3Q1w/VRLb+PiS9B4lzgUeqgNOpKfKUk4T47WFTP GkeW2+8qlw5ghym+0BC9VNAY4MnizrX6P6+Ow= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713520176; x=1714124976; 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=o87/x+VFy7QdGpzFKB0wOlVC4lrWjoCcMvbEo+2HMvU=; b=Bt5S3Jc2PLfy9mwXv+0I5+ro3uhJJhQhuhdCd5CJ2K6a716enk9Aql1ZHH34j3zEec 24FrdXzWBmWsdv149eUo9PgscUVjw1SWLUZnwYyJTZC32GRQe4NnMQxQfgO889ATPAmL nPcetYodB7K7fnT4ZX31xsDXpvhpeifEktcHUbHWjUyFkzNWTtt/gtPJ/ovBsZKY1iRq Mdapv4Zlqs7UfidtykZE80T9KbbHBl62p42xF+oF5/rj/uNdVXJ8yScbi1q2Myt3BL7W 3Zh5pOkepDeSY+O4fhVtlxJefLaGc75NA+EEC7z81qhXB1wPrew77HGCOurraMoHLgOU vPKg== X-Forwarded-Encrypted: i=1; AJvYcCUfiKkyeIhQMcAaUaLd00+6MiRrzQ6sUXSByJ8jd4qi/E2uhFe0PqNszczzEhuWJ/PNSFy/CUEpdFT+X6GbgQCyfJaOQKc6aixVBipziY9o9BdgxVU= X-Gm-Message-State: AOJu0YxlOhoDReVr8CsZ35qwD5g0yPR7Xy8+ArHZKtc8rvFLs6CpACmV N+ILS+k5E0AEyIZ+IQpPTTd1k02IAi9avjLbYKprtPJNxvrr2m4Pf2uc3v757Q== X-Google-Smtp-Source: AGHT+IF61myZQzLIJtZThv3LhAjLCPCU5PGkGLiYz8SZp337r7gQKsKEDGbkUPSHG1pPHq3o/FKykg== X-Received: by 2002:a05:620a:47c2:b0:78d:6ef5:f10d with SMTP id du2-20020a05620a47c200b0078d6ef5f10dmr1532638qkb.65.1713520175867; Fri, 19 Apr 2024 02:49:35 -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 dt14-20020a05620a478e00b0078d735ca917sm1434532qkb.123.2024.04.19.02.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 02:49:35 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 19 Apr 2024 09:48:00 +0000 Subject: [PATCH v2 14/26] media: dvb-frontends: drx39xyj: Use min macro MIME-Version: 1.0 Message-Id: <20240419-fix-cocci-v2-14-2119e692309c@chromium.org> References: <20240419-fix-cocci-v2-0-2119e692309c@chromium.org> In-Reply-To: <20240419-fix-cocci-v2-0-2119e692309c@chromium.org> To: Martin Tuma , Mauro Carvalho Chehab , Laurent Pinchart , 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 , Benjamin Mugnier , Sylvain Petinot , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Bjorn Andersson , Konrad Dybcio 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-20240419_024937_083937_2AE76A44 X-CRM114-Status: GOOD ( 12.45 ) 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/dvb-frontends/drx39xyj/drxj.c:1447:23-24: WARNING opportunity for min() drivers/media/dvb-frontends/drx39xyj/drxj.c:1662:21-22: WARNING opportunity for min() drivers/media/dvb-frontends/drx39xyj/drxj.c:1685:24-25: WARNING opportunity for min() Signed-off-by: Ricardo Ribalda --- drivers/media/dvb-frontends/drx39xyj/drxj.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c index 1ef53754bc03..6fcaf07e1b82 100644 --- a/drivers/media/dvb-frontends/drx39xyj/drxj.c +++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c @@ -1445,8 +1445,7 @@ static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr, /* Read block from I2C **************************************************** */ do { - u16 todo = (datasize < DRXDAP_MAX_RCHUNKSIZE ? - datasize : DRXDAP_MAX_RCHUNKSIZE); + u16 todo = min(datasize, DRXDAP_MAX_RCHUNKSIZE); bufx = 0; @@ -1660,7 +1659,7 @@ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr, Address must be rewritten because HI is reset after data transport and expects an address. */ - todo = (block_size < datasize ? block_size : datasize); + todo = min(block_size, datasize); if (todo == 0) { u16 overhead_size_i2c_addr = 0; u16 data_block_size = 0; @@ -1682,9 +1681,7 @@ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr, first_err = st; } bufx = 0; - todo = - (data_block_size < - datasize ? data_block_size : datasize); + todo = min(data_block_size, datasize); } memcpy(&buf[bufx], data, todo); /* write (address if can do and) data */