From patchwork Wed Nov 9 08:46:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Horia Geanta X-Patchwork-Id: 9418619 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A9A1601C0 for ; Wed, 9 Nov 2016 09:21:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B18125EA6 for ; Wed, 9 Nov 2016 09:21:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FC3B287D4; Wed, 9 Nov 2016 09:21:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90A3B25EA6 for ; Wed, 9 Nov 2016 09:21:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753047AbcKIJVh (ORCPT ); Wed, 9 Nov 2016 04:21:37 -0500 Received: from mail-by2nam01on0085.outbound.protection.outlook.com ([104.47.34.85]:56109 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752504AbcKIJVf (ORCPT ); Wed, 9 Nov 2016 04:21:35 -0500 Received: from BN6PR03CA0067.namprd03.prod.outlook.com (10.173.137.29) by DM5PR03MB2892.namprd03.prod.outlook.com (10.175.106.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.707.6; Wed, 9 Nov 2016 08:47:52 +0000 Received: from BN1BFFO11FD022.protection.gbl (2a01:111:f400:7c10::1:115) by BN6PR03CA0067.outlook.office365.com (2603:10b6:404:4c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12 via Frontend Transport; Wed, 9 Nov 2016 08:47:52 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD022.mail.protection.outlook.com (10.58.144.85) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.707.3 via Frontend Transport; Wed, 9 Nov 2016 08:47:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:808; Count:13 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.77.120]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uA98lTXT026193; Wed, 9 Nov 2016 01:47:49 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu CC: "David S. Miller" , Subject: [PATCH 08/14] crypto: caam - trivial code clean-up Date: Wed, 9 Nov 2016 10:46:18 +0200 Message-ID: <1478681184-9442-9-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1478681184-9442-1-git-send-email-horia.geanta@nxp.com> References: <1478681184-9442-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 X-IncomingHeaderCount: 13 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131231548715541759; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(104016004)(6666003)(50466002)(2950100002)(6916009)(110136003)(2870700001)(8676002)(33646002)(106466001)(23676002)(50226002)(105606002)(87936001)(229853001)(69596002)(356003)(47776003)(586003)(76176999)(77096005)(50986999)(92566002)(189998001)(5660300001)(36756003)(86362001)(81166006)(5820100001)(8936002)(2906002)(97736004)(81156014)(626004)(85426001)(305945005)(4326007)(68736007)(7846002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2892; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD022; 1:mNzr3AraqTnduKyQHgiPYgvOPrd3aBXsKTc4fkaPN3uvQqGKvTEaHHy7Bi+LKhP3a4PzqTsCcvv0IWp6d/JlKvo3dwrYYPJaCadZOkLL93RQZEYyITTrlt0LcyHAErRls3D6zvPIrP3IwEign6EXAl78RWHWWgpkwVhLg+21g2KsL2o/DffOYrOxVm4zBrgl0aQzshPFjWF4q8EX7W0JPi7smea7asTSxjr9zyQEJH2AmEIlnEKilbzXDNCryPOtTHQ5gvZezOFv/gSA/oKMpra8zBYTVccjApUE8M2r7NUByI+7X8Rvq/vR/T0jAeSfJMV7krh15+wRBPXSG4Q1CyTyQk+qbaBOYH5kYzkHJHvTpBMqNENPB+l3ltVEWzv8bj5yh7ASjrlgkDPtArSeiEFQ39Lb9/shO3t9jB07VwpnxFonz4WGgtz/d/BW6O2kXyH20Fxh3R+01oH7vexnzC28HylNRfNVN5Fb56DdWsClLIblWW8bDUcgH6jKysJEEUhypGd51VfUUZ9o8tV9vZO3LnNO0TLHbj/qOYsEns9zUW1npFsST85eYqJS9dBHG3bdGmWhTRuMOiTF3e9pykcwyvA/X3GO2YTqXmjCy5T7U5sA0vgGQycagcJkHF45 X-MS-Office365-Filtering-Correlation-Id: 6f6bb50c-c4b6-4d93-439e-08d4087d16f8 X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2892; 2:y4KkNNuY/qwhz0RiJeqodhr+xT/2zloRklh0EEd3k74Kx3Z0PwbYji914aIdpGNqPXb5FwvAh6bs6YBaYKegQA1vE+JFwbGrCAhavnDn79/FkaVCBkWF8mE28pMQhfVOB9opEvPGIDCJm0zhmEkViPaMMpbCcbUYzRdK5RXGn9YiOqLe5WsxQ6X0i14qIP++KsvG6nd5RBBZeRj2optFOw==; 3:seknq/E7DeHAejP6zhq7cjWPP3AoCc0qZz4BIIQSUMf18V3RULWkWQuZGFvmPeiBgvvmQRBPsUqVrLZc/cwsSM0WHLEriT6HbLTc8spP8uUXt2Wy5Mi4FyaNJNFi3SCoS3hdSFoCjsBxTwTnKBL/CHT4iwvDV39Ndp4tdYkXk7rI70oXSgefzE6DAeeCSDsMMVYGnHpTRqQlTvb506XCsqF10YflMV4rNblCeVOrLWen0+EZy0YJl0UkwV1F5KwY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM5PR03MB2892; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2892; 25:7wnP9wvhBSP63xMNpvjsoyA4YJGhtyvEuq9P0JoZqtBVrJaCUnNDH9GAo7nmP+SFxmLdUgXi2gJtPxuWzZwknU2O+m36PniUTjLpNMBpK4Hb9aR3mRqE+QUOjSPzD5sA9xzCgBTdIjrPmBeWo0wRopDR1+fQx4pabJrQeYudCrMz5lHCnxhVkRplGuKSGarIJKJYfUEdsR3rkw11SEE5rGknT17O3Unmssnk6iccOelRWTmPucMWeAtxYTO/lXsdDRLG3oiSjN3GJ/P8RxPeBGNb56jCDe2iJmjrYstUIOgBiXcZWyEne7DNkmdWdaWUIPHymEQjLxnhuJurqSDjo+BG+pwxZVfzRM5b67yEwrGAMh6zjjQvwtLWlkqgcHvTTXvyaE1BAcp/CQhAYPXDzqL65S3A9sZAKCWT7miCtMg3NxX3ltWL3R7ZcYgiTNAH27TXvzBiMeu4pEpVXJviS1nMCwKZQBETL7CRmr3mdJahlf8RDRBxa1BxkkxQGudJpeWJHagamjXA1dGjqHzurAscz9NbB8vuhBBsRQhfkYXw+Vo1/7J9yPpKsHrUjWhieQPn9nhoAr3pgwM24dVSPX+0tFoA/C0qRwZCr4N+pE01EvCZ4hRMKYtN2RCyYqMcDTpamcGHSZEkRCpAXa0MWLjoepZBK5U51FKMbo5PEW3Sc6KjolZrF6Y6Oe5CHJ17+atWSgvsRueuzTYsjkSDZjs/fdQNnCTbnk8PrCfM4acThKiJHKO3/ZKcCKH+m0vCuqr73cZ/To3yO67ehkkntDkZXvERhAtNsoNZ608R9PY= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2892; 31:B0kzJfb+A0hDJEkDKRuzrZYaiif6Eb9tYbzKDHMfUqqKEomxAT+0Dtx+XyjB73iyDeXIqXhlQHYuvtycbe9bwC6y1puTb5WXf66uJm9DDE3Ubk6WdQjuEhFCPKi1cPXw+33+LEUCdyuGcrja4ayExkvicvCZgKKevwKSxE2XGMJ144VM1hgiNP80bPbl7H9bQGBgMU99tcQr81bTBeLLZXoVfVQLkGr0WAm6RMzW1pAOxC6SxnPl4nuy+g+NpD/swEwFRxykIjV9lSVCAF+aogLoReJGRq34DEuwqKu0Vtk=; 4:gNQDVGwY2nGVxlOi/+l7BZBPyTegIxAv0mJoTdCxrX6DCk2z+pYdoQ2xlOES5GY7TImL7qFhhWDrZilC4IsGeVvSY84RHk9c50Gdn7tcNzRnGVuIDPNWWyGkhjYP6GhUBpaSJXfrLFLwvSqllm5xbl1+LdTxPlazSGq04SMJ/LWPbZnMDyfNpgHp4lSMdV4mkC0Mo2rPZgAw+YGbW48JxHEeg99Vf4qPYtPYY3Rt0L045QvlROy4tIEGRyAcHZjEg/PegKOxv7OH98cLSXAae2ZoxmfgpwOwKSwvPpnF4lwzWCH1Aev740Q4SI8DP2e8GVXixicNDn3qJtZ34oAbETUALgLLYo3zCAvuCGma9Orcvt4m6KicTpsgxhDdCJ3RHUogc/3VnZhhTMIZFuZD2Z2tbvf87uHPTlvwGy8Mucpbq6h1xXe339EEevPgEMcE1tTta2FFt6X+cdLsmJ8uaKH+30K0XNzTjUGGTmCnG4yjn7efYmlI2cHMv7SD8wpjILzgvYVqileJUhBaBcUBbhcW4vlm7+cZ9j50hx3y+r5R1OiekpSBr1gq8wzvcakg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13024025)(13017025)(8121501046)(13018025)(13015025)(13023025)(5005006)(3002001)(10201501046)(6055026); SRVR:DM5PR03MB2892; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2892; X-Forefront-PRVS: 0121F24F22 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjAzTUIyODkyOzIzOjl6cUF4QkpDUlNiTURCbFpvNWZzb0x2enVk?= =?utf-8?B?Z1FhVjBRcUNRK2VGcjhMQXVkc3hmT3hvQnd0TFdwSUdVMzlFa01zcmx1aFE4?= =?utf-8?B?TGlQemZsRXJqNWtJcFMrN0NlVEZRWHV5aFFBTkYxR2xOTGs5RHF0RDJKOHJM?= =?utf-8?B?cXkyMVIveHJSd3FKRGtRVFVtcGV5c0NHYnFxTU9jVThKREc4bVAvVFB1dHp3?= =?utf-8?B?WkNxdk9EdnVLMThMbGZCb1F0NmZZZk1NSjcxdEc4YS9zcW5JMkxIb3BiSWpB?= =?utf-8?B?V2hzMHJySHc5U29WMzQzN05YZTIrUVNhZTNJa2xrVFpScWxOVmtwN1NMNEZy?= =?utf-8?B?M1B1dWdwMTJWTEtxd1VCS3pZcERZbXQzWDQyOTdsSHRZSE9OUUcxNHBhcXJY?= =?utf-8?B?aUFOMlZUci8zVXBTT2daK2IxKzFJak9vMW5mcDMrUTFIVVd4Q2lxQjFmUndU?= =?utf-8?B?aEMwM3dwNGlYZzdMKytDNmhBTmVyMXdWemhVRWY3SXBKUzNlMm9nUzJCOU5S?= =?utf-8?B?UzFsd3MveDZSSndXMkk1VDU2dWpRVmJNZU02S3ZxNXNPVExON0hWQ2xRZWQx?= =?utf-8?B?ZHliekgyK2czYmszcjV0TlJYcEgxUUV1SEllU2U5ZE9PSUZHY3dJaFlIQkw1?= =?utf-8?B?QVViUTUxWEYwSjhqNkREa1V6bjAycWF2SktFM1dVL0xNTGNXemx5QjNJeU02?= =?utf-8?B?cTFhSXZDUlM1dEFzeEQrQ0xYbkVEUkF1ckVTZzlDdmp4OXplaFRveUNTMzM2?= =?utf-8?B?SFpESU12ckRxV1BhMm1HRXVBait1cHFSdVU4b3R6a3lVMHp1bC9sc2xJSnE1?= =?utf-8?B?dE9PdS83OUNPeEhsd2dmV2s0Tlo3anBUcGZ5b1ZyUFdBaVRnaWcwOG9YZ2hq?= =?utf-8?B?MktrRVkzZnA3dnFrZ0tnTWtFemRsQ3ppU0YwVzZ0RkVqNkFsNmszSUhBRkdx?= =?utf-8?B?b1dseE4xaWhFTnNORzFWRFhnNUF3di9JdXlETXowME5NdGFCWmNub0wvbEVI?= =?utf-8?B?SDlMRld6bERVRGRMR3czNVBYeWEzbFFnVFZYbGF4VmdudHdWV2pWRFlCV1E1?= =?utf-8?B?ckhmRzhRKzlHbU1XcTJOV2lQbTJaZHpWVWo1TUFwNm1SOHNoMXpEeXFqSGZr?= =?utf-8?B?bXpaVkFER3c0WmlmS21pY25weFA2bjNzanNwN2xFVktZZVRWNEhZOTRJNnkw?= =?utf-8?B?Ui9FM09EUzJWMWtTZGRIeDRDNW1MSlByNkFUWXZaMmI3OEJVdFNHbDN3Q1VE?= =?utf-8?B?VHl0WVluNlJLOUFuQjJLVjdZYXlqdVRlMEJIbUF6N01IYkVNbnJEd1A5ZlhD?= =?utf-8?B?bTlUZWtIUG4vYnFaN0haeXJmSGRTaWRpbUc3WHJiVnBLUTNFQnNwYy96Y040?= =?utf-8?B?cmIwMHlLblBlN2JNSlpRRjQ2bk1tVmR2cElrTjNNQ2c2U1pqWGtteUJvWjIw?= =?utf-8?B?NytmaHZRQ01jNzlwZHRIOXpmKzVsdXNuOEpGOG1zcVpSNVdST0N6Y1dVa2xi?= =?utf-8?Q?ReFyPqZhAR4rYvdBcR8sURD6U=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2892; 6:U9Vb6Nn92Y/ed25jMfUHKcBiVAlb6wveUqDVoZXES/vLmZf5mZ47GrfVmrA0tmPfA5EuXbn0CHEYvPIQfWF/RD9vgCKhGakpRYkg4u9q0XFKkrpQapyUjFp5Wa1ZIu6r7ceie2bfeQJVA55aKDPuYoZUex+viHl1DSPsXTGVVZPjlF6lAJKoEX6xu3wtHR02OLiQ3XaL4HLavOTTOuiUYagGxiUwmZVjmi8ksy/8qGH5JW1gJIozf8HttA+jNdpPFlGwjK5vm8PLb5U9fP+nwfJtEJEPdmXzz6fJ9bY/pkfa8IyfqL7N/u5JdG/DiKiE; 5:EYVDeddhNMU7ixEAzGF77feAqefO/bIzqkQ8uBaCZyMiVdE81gjkTVUepf6+3bgJAgqPlDOjVCNSiGqZz8SeaKtlC6mByOK5HE84YPLZCSg/+iI8x/R4EE16flzWx/QBKzoPxPxImT2CohrLVUHtSanwq7fvochy40wQv+lyM2leHUBWZ35tUemvVR5Z2Z63; 24:ErGnJycXhhA2aH3VpBQScpmemu4u33CApL068c+iMtfmKxSk8rgJLX1jTlFWqAs91J5eh3i6yKRAuuH55rBXMp3V7XvqbkLFT0cuqW0wVGU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2892; 7:6vwhfC06ql8z8rQJWpmyiaOr6kxs1PD/H9apM2FEM43qvBICSJN80CdVY0W92vFgHDIgW+eHAZcMioxQ8Egf9TaIs8JHNWrwY+c8W6avPO4tfnUdaQbSQn1JJOx2P6N72DB7JOM2ODT0whPulsbEyoSkWgVQ+IA3GT+jnQyLf5Tzxlgo4ia2Tx7vdcDR1FS2Cfa2G7WDI3pJRvfCqJJuIblNCbN/GpnCRs/cqtMxVbsFfawydb8LDSO7uD7jqB/fD0QzlOn3KyCM09gcdlCYnPqFXpWPQFpLCg3Au98CfCdC3+EMpwiAZMxRRYwvPsZaO/SijHjxRYkXuWFclPz42zZWkfs503LGBIxPf5PXEac= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2016 08:47:51.3045 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2892 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP -replace offsetof with container_of -remove unused "assoc_nents", "iv_dma" from aead_edesc and fix comments -remove unused CAAM_MAX_IV_LENGTH #define Signed-off-by: Horia Geantă --- drivers/crypto/caam/caamalg.c | 16 ++++------------ drivers/crypto/caam/caamhash.c | 12 ++++-------- drivers/crypto/caam/caamrng.c | 3 +-- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 1982dacce80e..34dfcdb7ff84 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -62,8 +62,6 @@ #define CAAM_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + \ CTR_RFC3686_NONCE_SIZE + \ SHA512_DIGEST_SIZE * 2) -/* max IV is max of AES_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE */ -#define CAAM_MAX_IV_LENGTH 16 #define AEAD_DESC_JOB_IO_LEN (DESC_JOB_IO_LEN + CAAM_CMD_SZ * 2) #define GCM_DESC_JOB_IO_LEN (AEAD_DESC_JOB_IO_LEN + \ @@ -1873,20 +1871,16 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, /* * aead_edesc - s/w-extended aead descriptor - * @assoc_nents: number of segments in associated data (SPI+Seq) scatterlist * @src_nents: number of segments in input scatterlist * @dst_nents: number of segments in output scatterlist - * @iv_dma: dma address of iv for checking continuity and link table - * @desc: h/w descriptor (variable length; must not exceed MAX_CAAM_DESCSIZE) * @sec4_sg_bytes: length of dma mapped sec4_sg space * @sec4_sg_dma: bus physical mapped address of h/w link table + * @sec4_sg: pointer to h/w link table * @hw_desc: the h/w job descriptor followed by any referenced link tables */ struct aead_edesc { - int assoc_nents; int src_nents; int dst_nents; - dma_addr_t iv_dma; int sec4_sg_bytes; dma_addr_t sec4_sg_dma; struct sec4_sg_entry *sec4_sg; @@ -1898,9 +1892,9 @@ struct aead_edesc { * @src_nents: number of segments in input scatterlist * @dst_nents: number of segments in output scatterlist * @iv_dma: dma address of iv for checking continuity and link table - * @desc: h/w descriptor (variable length; must not exceed MAX_CAAM_DESCSIZE) * @sec4_sg_bytes: length of dma mapped sec4_sg space * @sec4_sg_dma: bus physical mapped address of h/w link table + * @sec4_sg: pointer to h/w link table * @hw_desc: the h/w job descriptor followed by any referenced link tables */ struct ablkcipher_edesc { @@ -2017,8 +2011,7 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err); #endif - edesc = (struct ablkcipher_edesc *)((char *)desc - - offsetof(struct ablkcipher_edesc, hw_desc)); + edesc = container_of(desc, struct ablkcipher_edesc, hw_desc[0]); if (err) caam_jr_strstatus(jrdev, err); @@ -2050,8 +2043,7 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err); #endif - edesc = (struct ablkcipher_edesc *)((char *)desc - - offsetof(struct ablkcipher_edesc, hw_desc)); + edesc = container_of(desc, struct ablkcipher_edesc, hw_desc[0]); if (err) caam_jr_strstatus(jrdev, err); diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 51990dd56024..d5a06c6923c0 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -636,8 +636,7 @@ static void ahash_done(struct device *jrdev, u32 *desc, u32 err, dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err); #endif - edesc = (struct ahash_edesc *)((char *)desc - - offsetof(struct ahash_edesc, hw_desc)); + edesc = container_of(desc, struct ahash_edesc, hw_desc[0]); if (err) caam_jr_strstatus(jrdev, err); @@ -671,8 +670,7 @@ static void ahash_done_bi(struct device *jrdev, u32 *desc, u32 err, dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err); #endif - edesc = (struct ahash_edesc *)((char *)desc - - offsetof(struct ahash_edesc, hw_desc)); + edesc = container_of(desc, struct ahash_edesc, hw_desc[0]); if (err) caam_jr_strstatus(jrdev, err); @@ -706,8 +704,7 @@ static void ahash_done_ctx_src(struct device *jrdev, u32 *desc, u32 err, dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err); #endif - edesc = (struct ahash_edesc *)((char *)desc - - offsetof(struct ahash_edesc, hw_desc)); + edesc = container_of(desc, struct ahash_edesc, hw_desc[0]); if (err) caam_jr_strstatus(jrdev, err); @@ -741,8 +738,7 @@ static void ahash_done_ctx_dst(struct device *jrdev, u32 *desc, u32 err, dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err); #endif - edesc = (struct ahash_edesc *)((char *)desc - - offsetof(struct ahash_edesc, hw_desc)); + edesc = container_of(desc, struct ahash_edesc, hw_desc[0]); if (err) caam_jr_strstatus(jrdev, err); diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index 38bb2411afcf..41398da3edf4 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -100,8 +100,7 @@ static void rng_done(struct device *jrdev, u32 *desc, u32 err, void *context) { struct buf_data *bd; - bd = (struct buf_data *)((char *)desc - - offsetof(struct buf_data, hw_desc)); + bd = container_of(desc, struct buf_data, hw_desc[0]); if (err) caam_jr_strstatus(jrdev, err);