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>,
        Damian Muszynski <damian.muszynski@intel.com>,
        Adam Guerin <adam.guerin@intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        You Kangren <youkangren@vivo.com>,
        Tom Zanussi <tom.zanussi@linux.intel.com>,
        Srinivas Kerekare <srinivas.kerekare@intel.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, luhongfei@vivo.com
Subject: [PATCH v4] crypto: qat - Replace the if statement with min()
Date:   Tue,  4 Jul 2023 14:56:39 +0800
Message-Id: <20230704065643.32220-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?xiQS07ZejqvsOIpyX59Y5rmeFwBFfe3fpLERPyJE5AKfVOHquT3V2SLTtQC6?=
 =?us-ascii?Q?ohxxobPwn8iaylHyzdY5onTiJOwOyEDTHvq9D8SDgQLA8xkCboxmPN/O7Ftq?=
 =?us-ascii?Q?S72KPR9A0HCB400IuWN0EmVQZqKzOXV6MDi3+7rPslJJGfXjoqmlGj2SylS9?=
 =?us-ascii?Q?5THN8WBN1sV/zZq5vjx1SgfkJSv4IvDuv70kA43ERP+XTkmUT6UG1t1C2YEB?=
 =?us-ascii?Q?FzYc0XjDpQGmG3WFlOlgCDgb2NntfBZeUwcfWBbJ0RW7RYPpaZMrrGqEJ1Q1?=
 =?us-ascii?Q?5cq7nyFCdzH3wLvAO6YmUZ9Fp0oBOwu1Ig8BX5kOpNkpLPmy+JbXgXi9TTSx?=
 =?us-ascii?Q?PoZTRVh3wrVaEJCZV7KsRH7uW9qkZE/OodUU/Ac3y1dHCPWvMVndSepS48pA?=
 =?us-ascii?Q?KljzctXSqfSxy+P/fFiHAZ0+26+7RuKxr1xJN02maJHGPuJTUpzNwCnPEvHw?=
 =?us-ascii?Q?h2jlXPTysRASRK+EiX6lZjhFVNXW55HvVB1i+zLaYOQ1444HmJiyi5t9FNKk?=
 =?us-ascii?Q?A5+zPRBEGH9R9fUmJwS8xD0L57VRxfgipCdHgVXeKwJf3WM4U7ngk5t5BmPW?=
 =?us-ascii?Q?M692/8jAN39m76GZ59wN8ZRWG6SOttEx/gHnE7ooCaeawQIkVjz0YEheWBlC?=
 =?us-ascii?Q?2JWpWfiUXj3aEToGJl6ntSIE8hA4ace58kNylpypPii81gAGVklP55zRHUI+?=
 =?us-ascii?Q?x/q9oBuaSFdyNWxGlj9iaxwa6VHn6ra8II0Odt4S6Pn+nRJ521hL5BtSLBtB?=
 =?us-ascii?Q?azbb1ivwZC9LIAmWM2LyXBvUXSCf3kM1RdD7QcNa+ZzOZGCeMhrxIowKk6FG?=
 =?us-ascii?Q?37YU00uzEQe+/+LBe9xGPsyLg8lyxCrMaJjNSBvmCN9ipumbXlAABV2y9H7M?=
 =?us-ascii?Q?ib85WGxr07AGw+SedoPsgfFNp2pSsN//bAldIcVA7WSBS/YwgK4eBzPCsIvx?=
 =?us-ascii?Q?FfEdB6/zTStHndoOXSf2bD8OMAkUFsOoMQ0u5iYGzKyU04GYRFaCN06aoEgY?=
 =?us-ascii?Q?ynbKj4MekGP3GNtJXHRj9UAfMemBKrLOo+tydI3/0gEVb/Zi8KDtBJb/s4Bj?=
 =?us-ascii?Q?FnnCLb+LnbzxCJku1IfD5z3babgzCDQD64efFRULD2jGkNXpvvFSTIoc72HA?=
 =?us-ascii?Q?GQAgBiWn9dU8NqX48tx1AdVxfVz6x4C9iNIl72m5ZQuyKas+lLaeYH1HBZ5v?=
 =?us-ascii?Q?tnQBMYZ/69nkiQfxYO14ARrEWaRZmukD0hEW+IReM/HKEMLitSWjCC4Z3ejD?=
 =?us-ascii?Q?Xz/taCXXjQGpgtmg3H/Im5mL27scTKdaq4sxue3X2ezvLJMqwAgccGbtxVhc?=
 =?us-ascii?Q?XW/yF7Xg1swTFWIiS19BzR1On32hApa78oJtZGpEFOmQLYmZ/7TEf5wfbkFZ?=
 =?us-ascii?Q?QYU798Q3wfGPlCAlRfTKwpAyOhoLC148aZEU4u2Ni864D4lUmN+GlQgSdrdF?=
 =?us-ascii?Q?lCzxxW3LRdYOI1c9si3NL/2NRDK3gfc9GoUEPMuFOFxRTL3ji7mQmtumHpSE?=
 =?us-ascii?Q?kL1XharbQBJ5dQ4Zfc7DxCbN4xWoxprZwDBwnQIyvaoyjW0VCd2PRx+k91SN?=
 =?us-ascii?Q?/TuzNZMc51d3FKWqHqg6swLj8e2R/KhsuS7To7s0?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9a20d304-57cd-43b9-5402-08db7c5d979e
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2023 07:09:22.2703
 (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: 4h8MxoOvwGJUjS+GPisDqz+eWMl8oR8X9VYK2lMdSrshBpwNRm8hKFV1CfVAeDyHjQdaGRw3COA0DSWG9MUQmg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4586
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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() in 
qat_uclo_wr_uimage_raw_page() to make code shorter

Signed-off-by: You Kangren <youkangren@vivo.com>
---
 drivers/crypto/intel/qat/qat_common/qat_uclo.c | 7 ++-----
 1 file changed, 2 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..4bd150d1441a 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
@@ -11,7 +11,7 @@
 #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 +1986,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