Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   You Kangren <youkangren@vivo.com>
To:     Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        "David S. Miller" <davem@davemloft.net>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Adam Guerin <adam.guerin@intel.com>,
        Srinivas Kerekare <srinivas.kerekare@intel.com>,
        Tom Zanussi <tom.zanussi@linux.intel.com>,
        Damian Muszynski <damian.muszynski@intel.com>,
        You Kangren <youkangren@vivo.com>,
        qat-linux@intel.com (open list:QAT DRIVER),
        linux-crypto@vger.kernel.org (open list:CRYPTO API),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com
Subject: [PATCH v3] crypto: qat - Replace the if statement with min()
Date:   Mon,  3 Jul 2023 20:37:36 +0800
Message-Id: <20230703123739.28142-1-youkangren@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?c10So6RQbCw59tCrDBeyIiQMSCHGtcVQG2vp1Lvy3XR76wLASFcmP51QGNwA?=
 =?us-ascii?Q?nCiEEDEzXdro8AIOviSjzTNgVNisM4eRWcwBdoxauGohRgt374XGK7ZNmWNb?=
 =?us-ascii?Q?BTCDMXKBDsGIKC2J4Xz7hZCUX5KjwZvlZv2JAaJQWwffQtKHY1cw+GDlejn+?=
 =?us-ascii?Q?UTQSMtLkCsUCTGmXmmLnG6ghv++vf2kqr+EoUNi8hKRxWXBTfl1pJwXxg2Ij?=
 =?us-ascii?Q?coSLEWSSdf5JdJpeqjTox3/qTTun8feA9UKy4UpfnnKj9p6SBU3oalP6KWgu?=
 =?us-ascii?Q?+SD5++DXMQxfX8FHsAEL3LsbqPJcD6Sg8qACFS0gKyRRXppjFC2mHwDlIeYb?=
 =?us-ascii?Q?QUNRFCVMUh2OOBiObRUUwpioWc/8kRo8V1hJ+X11eKwABXyy4AmIfiV7Zemr?=
 =?us-ascii?Q?/IRUo0Xp7bb9ilxGUHFBdvesqkzkRT2wuMawrsJIDGY1GHk2rtlVRBknudfd?=
 =?us-ascii?Q?CTwhKESr3dcSkJtCqjtryDbWDn92itmctLbWVV0iVGdLxcs3yLV3bQoo3Lay?=
 =?us-ascii?Q?GV8B8R4vtSbFqCQrDmrFRgLEoOd36A9XrX7I6QdzAifhHEwh/+Pw8NyVYUZI?=
 =?us-ascii?Q?S4owzgskBMCGnfvPcCMeiHFcaX1hC4Q/s12SfbiQTNrUpVB4CjLdl22lgsP5?=
 =?us-ascii?Q?CEHlAbYLWcxk/6r6PZMb9jNT8pgnifif+cw7S0BPDGXgY9iRz48wJHh9iKE3?=
 =?us-ascii?Q?SX7tCYfqhJcWWmB/ITjDwtm+HPcz8BYk+M6lXr3bQ5hxyF1BC14tXt5gKTdc?=
 =?us-ascii?Q?09Al7HLewnIJRL6KitKx6h1zw2fFuLeMwMFAEcztusEBvzGmM2cj0razB1mr?=
 =?us-ascii?Q?STmEtiIr79cjFr7ns8mJBdXx9oCMyob8E8cftFn6DziukmcJwSjt4hohj2By?=
 =?us-ascii?Q?5IVVLo5stOVeRf7WEDZqGVv1AzAtjFzlL4wHyBnYC1yJBvuKnjSQV6wDkw+b?=
 =?us-ascii?Q?UXe+MrOvs88ur/STD20mDRF5/SSp6dMQB2ew+86bLYry6VHIO4W6UwLJdZTm?=
 =?us-ascii?Q?qj18ScZgiZb5/uZ6+n9BGKUWnmRcpeb97qTCzNyAewOzxpSXFaW5wkCDR5kO?=
 =?us-ascii?Q?8JpZq/ivWG8z58jKVxDwZ6zev+2EXpbqwN1ke8Dlo3EKNCHMkj6jUGzUypt8?=
 =?us-ascii?Q?Y3w6SUz6UEJWJ3rTlW2fRVIJNkk03c6MaamWb+xoTVHLA6rZIza74w+Tlw5f?=
 =?us-ascii?Q?9DRginO2oYfQ5uc+A/FQAn8nA4Sp+W31BRxG0ZQO69AnIHswEwMNPs/O/R8R?=
 =?us-ascii?Q?uFkPLt49n13vbhXTpZRRQShgKZwargp6DooRWG0vqUjWeKGsr4ngKo4p6lTF?=
 =?us-ascii?Q?5HG+DboUN9kjwicMRE3Z6e4IdOUqxxK4n+potrPNkVekzuotkTH2ct61VIOn?=
 =?us-ascii?Q?WCn+k73sZatNWWWJKgeUQD/RSSaotaBSFkcoxhthwZlEmkGuuO7UC/PUZE6v?=
 =?us-ascii?Q?Nib96oy8plLT2pi9N0Bj9vXeYtwr9GkDqKIrcAE9HBS93QJ/u4qzrwYi8iDm?=
 =?us-ascii?Q?FDCnOCVZts+2mZ1sxbc6+HJqOCjNYss2Qv6A/E/2RkjH0kQi17UZjw9a70Vz?=
 =?us-ascii?Q?GNiT65HaFmxTmuwjKW/bYCu/jK5+ObYPV7kOGiDn?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8d41431b-e7c2-4271-5889-08db7bc24cc6
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2023 12:37:44.7089
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: X8nfwyR8rGUX9yywjzQ36WqtkG9Y8BJnziiFLrqvPsRZ+nFm6X74dlbarcp7PPoue74BcBDtQOzScMd641HKhg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4443
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

mark UWORD_CPYBUF_SIZE with U suffix to make the type the same with 
words_num and replace the if statement with min()

Signed-off-by: You Kangren <youkangren@vivo.com>
---
 drivers/crypto/intel/qat/qat_common/qat_uclo.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
index ce837bcc1cab..bad65f154777 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
@@ -5,13 +5,14 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/pci_ids.h>
+#include <linux/minmax.h>
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
 #include "icp_qat_uclo.h"
 #include "icp_qat_hal.h"
 #include "icp_qat_fw_loader_handle.h"
 
-#define UWORD_CPYBUF_SIZE 1024
+#define UWORD_CPYBUF_SIZE 1024U
 #define INVLD_UWORD 0xffffffffffull
 #define PID_MINOR_REV 0xf
 #define PID_MAJOR_REV (0xf << 4)
@@ -1986,10 +1987,7 @@ static void qat_uclo_wr_uimage_raw_page(struct icp_qat_fw_loader_handle *handle,
 	uw_relative_addr = 0;
 	words_num = encap_page->micro_words_num;
 	while (words_num) {
-		if (words_num < UWORD_CPYBUF_SIZE)
-			cpylen = words_num;
-		else
-			cpylen = UWORD_CPYBUF_SIZE;
+		cpylen = min(words_num, UWORD_CPYBUF_SIZE);
 
 		/* load the buffer */
 		for (i = 0; i < cpylen; i++)
-- 
2.39.0