Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bf48512 authored by Simon Sandström's avatar Simon Sandström Committed by Greg Kroah-Hartman
Browse files

staging: ccree: Use sizeof(variable) in memory allocs 



Fixes 9 checkpatch.pl warnings of type
"Prefer kmalloc(sizeof(variable)...) over kmalloc(sizeof(type)...)"
in staging/ccree.

Signed-off-by: default avatarSimon Sandström <simon@nikanor.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b4bac77f

drivers/staging/ccree/ssi_aead.c

+2 −2
Original line number Diff line number Diff line
@@ -2659,7 +2659,7 @@ static struct ssi_crypto_alg *ssi_aead_create_alg(struct ssi_alg_template *templ 
	struct ssi_crypto_alg *t_alg;

	struct aead_alg *alg;



	t_alg = kzalloc(sizeof(struct ssi_crypto_alg), GFP_KERNEL);

	t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL);

	if (!t_alg) {

		SSI_LOG_ERR("failed to allocate t_alg\n");

		return ERR_PTR(-ENOMEM);
@@ -2714,7 +2714,7 @@ int ssi_aead_alloc(struct ssi_drvdata *drvdata) 
	int rc = -ENOMEM;

	int alg;



	aead_handle = kmalloc(sizeof(struct ssi_aead_handle), GFP_KERNEL);

	aead_handle = kmalloc(sizeof(*aead_handle), GFP_KERNEL);

	if (!aead_handle) {

		rc = -ENOMEM;

		goto fail0;

drivers/staging/ccree/ssi_cipher.c

+2 −3
Original line number Diff line number Diff line
@@ -1218,7 +1218,7 @@ struct ssi_crypto_alg *ssi_ablkcipher_create_alg(struct ssi_alg_template *templa 
	struct ssi_crypto_alg *t_alg;

	struct crypto_alg *alg;



	t_alg = kzalloc(sizeof(struct ssi_crypto_alg), GFP_KERNEL);

	t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL);

	if (!t_alg) {

		SSI_LOG_ERR("failed to allocate t_alg\n");

		return ERR_PTR(-ENOMEM);
@@ -1279,8 +1279,7 @@ int ssi_ablkcipher_alloc(struct ssi_drvdata *drvdata) 
	int rc = -ENOMEM;

	int alg;



	ablkcipher_handle = kmalloc(sizeof(struct ssi_blkcipher_handle),

				    GFP_KERNEL);

	ablkcipher_handle = kmalloc(sizeof(*ablkcipher_handle), GFP_KERNEL);

	if (!ablkcipher_handle)

		return -ENOMEM;

drivers/staging/ccree/ssi_driver.c

+2 −1
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ static int init_cc_resources(struct platform_device *plat_dev) 
	struct resource *req_mem_cc_regs = NULL;

	void __iomem *cc_base = NULL;

	bool irq_registered = false;

	struct ssi_drvdata *new_drvdata = kzalloc(sizeof(struct ssi_drvdata), GFP_KERNEL);

	struct ssi_drvdata *new_drvdata = kzalloc(sizeof(*new_drvdata),

						  GFP_KERNEL);

	struct device *dev = &plat_dev->dev;

	struct device_node *np = dev->of_node;

	u32 signature_val;

drivers/staging/ccree/ssi_hash.c

+4 −4
Original line number Diff line number Diff line
@@ -2060,9 +2060,9 @@ ssi_hash_create_alg(struct ssi_hash_template *template, bool keyed) 
	struct crypto_alg *alg;

	struct ahash_alg *halg;



	t_crypto_alg = kzalloc(sizeof(struct ssi_hash_alg), GFP_KERNEL);

	t_crypto_alg = kzalloc(sizeof(*t_crypto_alg), GFP_KERNEL);

	if (!t_crypto_alg) {

		SSI_LOG_ERR("failed to allocate t_alg\n");

		SSI_LOG_ERR("failed to allocate t_crypto_alg\n");

		return ERR_PTR(-ENOMEM);

	}
@@ -2226,10 +2226,10 @@ int ssi_hash_alloc(struct ssi_drvdata *drvdata) 
	int rc = 0;

	int alg;



	hash_handle = kzalloc(sizeof(struct ssi_hash_handle), GFP_KERNEL);

	hash_handle = kzalloc(sizeof(*hash_handle), GFP_KERNEL);

	if (!hash_handle) {

		SSI_LOG_ERR("kzalloc failed to allocate %zu B\n",

			    sizeof(struct ssi_hash_handle));

			    sizeof(*hash_handle));

		rc = -ENOMEM;

		goto fail;

	}

drivers/staging/ccree/ssi_ivgen.c

+3 −2
Original line number Diff line number Diff line
@@ -191,10 +191,11 @@ int ssi_ivgen_init(struct ssi_drvdata *drvdata) 
	int rc;



	/* Allocate "this" context */

	drvdata->ivgen_handle = kzalloc(sizeof(struct ssi_ivgen_ctx), GFP_KERNEL);

	drvdata->ivgen_handle = kzalloc(sizeof(*drvdata->ivgen_handle),

					GFP_KERNEL);

	if (!drvdata->ivgen_handle) {

		SSI_LOG_ERR("Not enough memory to allocate IVGEN context "

			   "(%zu B)\n", sizeof(struct ssi_ivgen_ctx));

			   "(%zu B)\n", sizeof(*drvdata->ivgen_handle));

		rc = -ENOMEM;

		goto out;

	}