From nobody Fri Dec 26 23:36:07 2025 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8C6D567C; Fri, 29 Dec 2023 06:44:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4T1bT33LxczsTS5; Fri, 29 Dec 2023 14:44:23 +0800 (CST) Received: from dggpeml500001.china.huawei.com (unknown [7.185.36.227]) by mail.maildlp.com (Postfix) with ESMTPS id 0BC861402CA; Fri, 29 Dec 2023 14:44:52 +0800 (CST) Received: from huawei.com (10.69.192.56) by dggpeml500001.china.huawei.com (7.185.36.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 29 Dec 2023 14:44:51 +0800 From: Qi Tao To: , , CC: , Subject: [PATCH 2/4] crypto: hisilicon/sec2 - modify nested macro call Date: Fri, 29 Dec 2023 14:44:19 +0800 Message-ID: <20231229064421.16981-3-taoqi10@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20231229064421.16981-1-taoqi10@huawei.com> References: <20231229064421.16981-1-taoqi10@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500001.china.huawei.com (7.185.36.227) Content-Type: text/plain; charset="utf-8" Nested macros are integrated into a single macro, making the code simpler. Signed-off-by: Qi Tao --- drivers/crypto/hisilicon/sec2/sec_crypto.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hi= silicon/sec2/sec_crypto.c index f028dcfd0ead..692ba3213cc6 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -2145,8 +2145,8 @@ static int sec_skcipher_decrypt(struct skcipher_reque= st *sk_req) return sec_skcipher_crypto(sk_req, false); } =20 -#define SEC_SKCIPHER_GEN_ALG(sec_cra_name, sec_set_key, sec_min_key_size, \ - sec_max_key_size, ctx_init, ctx_exit, blk_size, iv_size)\ +#define SEC_SKCIPHER_ALG(sec_cra_name, sec_set_key, \ + sec_min_key_size, sec_max_key_size, blk_size, iv_size)\ {\ .base =3D {\ .cra_name =3D sec_cra_name,\ @@ -2158,8 +2158,8 @@ static int sec_skcipher_decrypt(struct skcipher_reque= st *sk_req) .cra_ctxsize =3D sizeof(struct sec_ctx),\ .cra_module =3D THIS_MODULE,\ },\ - .init =3D ctx_init,\ - .exit =3D ctx_exit,\ + .init =3D sec_skcipher_ctx_init,\ + .exit =3D sec_skcipher_ctx_exit,\ .setkey =3D sec_set_key,\ .decrypt =3D sec_skcipher_decrypt,\ .encrypt =3D sec_skcipher_encrypt,\ @@ -2168,11 +2168,6 @@ static int sec_skcipher_decrypt(struct skcipher_requ= est *sk_req) .ivsize =3D iv_size,\ } =20 -#define SEC_SKCIPHER_ALG(name, key_func, min_key_size, \ - max_key_size, blk_size, iv_size) \ - SEC_SKCIPHER_GEN_ALG(name, key_func, min_key_size, max_key_size, \ - sec_skcipher_ctx_init, sec_skcipher_ctx_exit, blk_size, iv_size) - static struct sec_skcipher sec_skciphers[] =3D { { .alg_msk =3D BIT(0), --=20 2.33.0