torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto: xilinx - Remove union from zynqmp_aead_drv_ctx

Browse Source 
"alg" in zynqmp_aead_drv_ctx is single field union variable.
Remove unnecessary alg union from structure.

Signed-off-by: Harsh Jain <h.jain@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Harsh Jain
2025-12-20 21:28:53 +05:30
committed by Herbert Xu
parent c15291e227
commit c7a768f57d
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/crypto/xilinx/zynqmp-aes-gcm.c
View File

@@ -43,9 +43,7 @@ enum zynqmp_aead_keysrc {
};
struct zynqmp_aead_drv_ctx {
union {
struct aead_engine_alg aead;
} alg;
struct aead_engine_alg aead;
struct device *dev;
struct crypto_engine *engine;
};
@@ -289,7 +287,7 @@ static int zynqmp_aes_aead_encrypt(struct aead_request *req)
struct zynqmp_aead_req_ctx *rq_ctx = aead_request_ctx(req);
rq_ctx->op = ZYNQMP_AES_ENCRYPT;
drv_ctx = container_of(alg, struct zynqmp_aead_drv_ctx, alg.aead.base);
drv_ctx = container_of(alg, struct zynqmp_aead_drv_ctx, aead.base);
return crypto_transfer_aead_request_to_engine(drv_ctx->engine, req);
}
@@ -302,7 +300,7 @@ static int zynqmp_aes_aead_decrypt(struct aead_request *req)
struct zynqmp_aead_req_ctx *rq_ctx = aead_request_ctx(req);
rq_ctx->op = ZYNQMP_AES_DECRYPT;
drv_ctx = container_of(alg, struct zynqmp_aead_drv_ctx, alg.aead.base);
drv_ctx = container_of(alg, struct zynqmp_aead_drv_ctx, aead.base);
return crypto_transfer_aead_request_to_engine(drv_ctx->engine, req);
}
@@ -315,16 +313,16 @@ static int zynqmp_aes_aead_init(struct crypto_aead *aead)
struct zynqmp_aead_drv_ctx *drv_ctx;
struct aead_alg *alg = crypto_aead_alg(aead);
drv_ctx = container_of(alg, struct zynqmp_aead_drv_ctx, alg.aead.base);
drv_ctx = container_of(alg, struct zynqmp_aead_drv_ctx, aead.base);
tfm_ctx->dev = drv_ctx->dev;
tfm_ctx->fbk_cipher = crypto_alloc_aead(drv_ctx->alg.aead.base.base.cra_name,
tfm_ctx->fbk_cipher = crypto_alloc_aead(drv_ctx->aead.base.base.cra_name,
0,
CRYPTO_ALG_NEED_FALLBACK);
if (IS_ERR(tfm_ctx->fbk_cipher)) {
pr_err("%s() Error: failed to allocate fallback for %s\n",
__func__, drv_ctx->alg.aead.base.base.cra_name);
__func__, drv_ctx->aead.base.base.cra_name);
return PTR_ERR(tfm_ctx->fbk_cipher);
}
@@ -349,7 +347,7 @@ static void zynqmp_aes_aead_exit(struct crypto_aead *aead)
}
static struct zynqmp_aead_drv_ctx aes_drv_ctx = {
.alg.aead.base = {
.aead.base = {
.setkey = zynqmp_aes_aead_setkey,
.setauthsize = zynqmp_aes_aead_setauthsize,
.encrypt = zynqmp_aes_aead_encrypt,
@@ -372,7 +370,7 @@ static struct zynqmp_aead_drv_ctx aes_drv_ctx = {
.cra_module = THIS_MODULE,
}
},
.alg.aead.op = {
.aead.op = {
.do_one_request = zynqmp_handle_aes_req,
},
};
@@ -407,7 +405,7 @@ static int zynqmp_aes_aead_probe(struct platform_device *pdev)
goto err_engine;
}
err = crypto_engine_register_aead(&aes_drv_ctx.alg.aead);
err = crypto_engine_register_aead(&aes_drv_ctx.aead);
if (err < 0) {
dev_err(dev, "Failed to register AEAD alg.\n");
goto err_aead;
@@ -415,7 +413,7 @@ static int zynqmp_aes_aead_probe(struct platform_device *pdev)
return 0;
err_aead:
crypto_engine_unregister_aead(&aes_drv_ctx.alg.aead);
crypto_engine_unregister_aead(&aes_drv_ctx.aead);
err_engine:
if (aes_drv_ctx.engine)
@@ -427,7 +425,7 @@ err_engine:
static void zynqmp_aes_aead_remove(struct platform_device *pdev)
{
crypto_engine_exit(aes_drv_ctx.engine);
crypto_engine_unregister_aead(&aes_drv_ctx.alg.aead);
crypto_engine_unregister_aead(&aes_drv_ctx.aead);
}
static const struct of_device_id zynqmp_aes_dt_ids[] = {