Commit c7a768f5 authored by Harsh Jain's avatar Harsh Jain Committed by Herbert Xu
Browse files

crypto: xilinx - Remove union from zynqmp_aead_drv_ctx 



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

Signed-off-by: default avatarHarsh Jain <h.jain@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c15291e2

drivers/crypto/xilinx/zynqmp-aes-gcm.c

+11 −13
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ enum zynqmp_aead_keysrc { 
};



struct zynqmp_aead_drv_ctx {

	union {

	struct aead_engine_alg aead;

	} alg;

	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 @@ static int zynqmp_aes_aead_probe(struct platform_device *pdev) 
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[] = {