Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

This was done entirely with mindless brute force, using

    git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
        xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'

to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.

Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.

For the same reason the 'flex' versions will be done as a separate
conversion.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

71 files changed, 111 insertions, 111 deletions

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 772509993079..c61f4473c0fa 100644
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -974,7 +974,7 @@ static int crypto4xx_register_alg(struct crypto4xx_device *sec_dev,
 	int rc = 0;
 
 	for (i = 0; i < array_size; i++) {
-		alg = kzalloc_obj(struct crypto4xx_alg, GFP_KERNEL);
+		alg = kzalloc_obj(struct crypto4xx_alg);
 		if (!alg)
 			return -ENOMEM;
 
diff --git a/drivers/crypto/amcc/crypto4xx_trng.c b/drivers/crypto/amcc/crypto4xx_trng.c
index 6738cdbaded9..cfd66b779ce1 100644
--- a/drivers/crypto/amcc/crypto4xx_trng.c
+++ b/drivers/crypto/amcc/crypto4xx_trng.c
@@ -87,7 +87,7 @@ void ppc4xx_trng_probe(struct crypto4xx_core_device *core_dev)
 	if (!dev->trng_base)
 		goto err_out;
 
-	rng = kzalloc_obj(*rng, GFP_KERNEL);
+	rng = kzalloc_obj(*rng);
 	if (!rng)
 		goto err_out;
 
diff --git a/drivers/crypto/atmel-ecc.c b/drivers/crypto/atmel-ecc.c
index d19694400693..b6a77c8d439c 100644
--- a/drivers/crypto/atmel-ecc.c
+++ b/drivers/crypto/atmel-ecc.c
@@ -99,7 +99,7 @@ static int atmel_ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
 		return crypto_kpp_set_secret(ctx->fallback, buf, len);
 	}
 
-	cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+	cmd = kmalloc_obj(*cmd);
 	if (!cmd)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/atmel-i2c.c b/drivers/crypto/atmel-i2c.c
index 27dd37997872..da3cd986b1eb 100644
--- a/drivers/crypto/atmel-i2c.c
+++ b/drivers/crypto/atmel-i2c.c
@@ -321,7 +321,7 @@ static int device_sanity_check(struct i2c_client *client)
 	struct atmel_i2c_cmd *cmd;
 	int ret;
 
-	cmd = kmalloc_obj(*cmd, GFP_KERNEL);
+	cmd = kmalloc_obj(*cmd);
 	if (!cmd)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index a925c7afbbdb..1f1341a16c42 100644
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -2207,7 +2207,7 @@ struct atmel_sha_authenc_ctx *atmel_sha_authenc_spawn(unsigned long mode)
 	tctx->start = atmel_sha_authenc_start;
 	tctx->flags = mode;
 
-	auth = kzalloc_obj(*auth, GFP_KERNEL);
+	auth = kzalloc_obj(*auth);
 	if (!auth) {
 		err = -ENOMEM;
 		goto err_free_ahash;
diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index 810917475c4f..167372936ca7 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -3224,14 +3224,14 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, u32 *keylen, u8 *key,
 	int ret = -ENOMEM;
 	struct dpaa2_fl_entry *in_fle, *out_fle;
 
-	req_ctx = kzalloc_obj(*req_ctx, GFP_KERNEL);
+	req_ctx = kzalloc_obj(*req_ctx);
 	if (!req_ctx)
 		return -ENOMEM;
 
 	in_fle = &req_ctx->fd_flt[1];
 	out_fle = &req_ctx->fd_flt[0];
 
-	flc = kzalloc_obj(*flc, GFP_KERNEL);
+	flc = kzalloc_obj(*flc);
 	if (!flc)
 		goto err_flc;
 
@@ -4635,7 +4635,7 @@ static struct caam_hash_alg *caam_hash_alloc(struct device *dev,
 	struct ahash_alg *halg;
 	struct crypto_alg *alg;
 
-	t_alg = kzalloc_obj(*t_alg, GFP_KERNEL);
+	t_alg = kzalloc_obj(*t_alg);
 	if (!t_alg)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index cee9034aa87b..628c43a7efc4 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1904,7 +1904,7 @@ caam_hash_alloc(struct caam_hash_template *template,
 	struct ahash_alg *halg;
 	struct crypto_alg *alg;
 
-	t_alg = kzalloc_obj(*t_alg, GFP_KERNEL);
+	t_alg = kzalloc_obj(*t_alg);
 	if (!t_alg)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
index a4e1984053da..c4bfe8e4aa2c 100644
--- a/drivers/crypto/caam/qi.c
+++ b/drivers/crypto/caam/qi.c
@@ -619,7 +619,7 @@ static int alloc_rsp_fq_cpu(struct device *qidev, unsigned int cpu)
 	struct qman_fq *fq;
 	int ret;
 
-	fq = kzalloc_obj(*fq, GFP_KERNEL);
+	fq = kzalloc_obj(*fq);
 	if (!fq)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c
index 41084767c577..2c9a2af38876 100644
--- a/drivers/crypto/cavium/cpt/cptvf_main.c
+++ b/drivers/crypto/cavium/cpt/cptvf_main.c
@@ -35,7 +35,7 @@ static int init_worker_threads(struct cpt_vf *cptvf)
 	struct cptvf_wqe_info *cwqe_info;
 	int i;
 
-	cwqe_info = kzalloc_obj(*cwqe_info, GFP_KERNEL);
+	cwqe_info = kzalloc_obj(*cwqe_info);
 	if (!cwqe_info)
 		return -ENOMEM;
 
@@ -111,7 +111,7 @@ static int alloc_pending_queues(struct pending_qinfo *pqinfo, u32 qlen,
 	pqinfo->qlen = qlen;
 
 	for_each_pending_queue(pqinfo, queue, i) {
-		queue->head = kzalloc_objs(*queue->head, qlen, GFP_KERNEL);
+		queue->head = kzalloc_objs(*queue->head, qlen);
 		if (!queue->head) {
 			ret = -ENOMEM;
 			goto pending_qfail;
@@ -225,7 +225,7 @@ static int alloc_command_queues(struct cpt_vf *cptvf,
 		queue = &cqinfo->queue[i];
 		INIT_HLIST_HEAD(&cqinfo->queue[i].chead);
 		do {
-			curr = kzalloc_obj(*curr, GFP_KERNEL);
+			curr = kzalloc_obj(*curr);
 			if (!curr)
 				goto cmd_qfail;
 
diff --git a/drivers/crypto/cavium/nitrox/nitrox_isr.c b/drivers/crypto/cavium/nitrox/nitrox_isr.c
index 5ffb1aa90cba..cf09f7451f6f 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_isr.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_isr.c
@@ -320,7 +320,7 @@ int nitrox_register_interrupts(struct nitrox_device *ndev)
 	}
 	ndev->num_vecs = nr_vecs;
 
-	ndev->qvec = kzalloc_objs(*qvec, nr_vecs, GFP_KERNEL);
+	ndev->qvec = kzalloc_objs(*qvec, nr_vecs);
 	if (!ndev->qvec) {
 		pci_free_irq_vectors(pdev);
 		return -ENOMEM;
@@ -424,7 +424,7 @@ int nitrox_sriov_register_interupts(struct nitrox_device *ndev)
 		return ret;
 	}
 
-	qvec = kzalloc_objs(*qvec, NR_NON_RING_VECTORS, GFP_KERNEL);
+	qvec = kzalloc_objs(*qvec, NR_NON_RING_VECTORS);
 	if (!qvec) {
 		pci_disable_msix(pdev);
 		return -ENOMEM;
diff --git a/drivers/crypto/cavium/nitrox/nitrox_lib.c b/drivers/crypto/cavium/nitrox/nitrox_lib.c
index 31eb8c874257..d35303857476 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_lib.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_lib.c
@@ -219,7 +219,7 @@ void *crypto_alloc_context(struct nitrox_device *ndev)
 	void *vaddr;
 	dma_addr_t dma;
 
-	chdr = kmalloc_obj(*chdr, GFP_KERNEL);
+	chdr = kmalloc_obj(*chdr);
 	if (!chdr)
 		return NULL;
 
diff --git a/drivers/crypto/cavium/nitrox/nitrox_main.c b/drivers/crypto/cavium/nitrox/nitrox_main.c
index d0e1e34a7b8b..8664d97261fe 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_main.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_main.c
@@ -441,7 +441,7 @@ static int nitrox_probe(struct pci_dev *pdev,
 		goto flr_fail;
 	pci_set_master(pdev);
 
-	ndev = kzalloc_obj(*ndev, GFP_KERNEL);
+	ndev = kzalloc_obj(*ndev);
 	if (!ndev) {
 		err = -ENOMEM;
 		goto ndev_fail;
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
index 240bcfa26c62..ead7566d78da 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
@@ -354,7 +354,7 @@ int ccp_register_aes_cmac_algs(struct list_head *head)
 	struct crypto_alg *base;
 	int ret;
 
-	ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+	ccp_alg = kzalloc_obj(*ccp_alg);
 	if (!ccp_alg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-galois.c b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
index db5c498f379b..6c8d1b87d60d 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-galois.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
@@ -212,7 +212,7 @@ static int ccp_register_aes_aead(struct list_head *head,
 	struct aead_alg *alg;
 	int ret;
 
-	ccp_aead = kzalloc_obj(*ccp_aead, GFP_KERNEL);
+	ccp_aead = kzalloc_obj(*ccp_aead);
 	if (!ccp_aead)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-xts.c b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
index 5cd8c2d270c3..c7e26ce71156 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-xts.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-xts.c
@@ -231,7 +231,7 @@ static int ccp_register_aes_xts_alg(struct list_head *head,
 	struct skcipher_alg *alg;
 	int ret;
 
-	ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+	ccp_alg = kzalloc_obj(*ccp_alg);
 	if (!ccp_alg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/ccp-crypto-aes.c b/drivers/crypto/ccp/ccp-crypto-aes.c
index 97ce93434953..01d298350b92 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes.c
@@ -294,7 +294,7 @@ static int ccp_register_aes_alg(struct list_head *head,
 	struct skcipher_alg *alg;
 	int ret;
 
-	ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+	ccp_alg = kzalloc_obj(*ccp_alg);
 	if (!ccp_alg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/ccp-crypto-des3.c b/drivers/crypto/ccp/ccp-crypto-des3.c
index 8c0f903c3330..c20b5a6a340a 100644
--- a/drivers/crypto/ccp/ccp-crypto-des3.c
+++ b/drivers/crypto/ccp/ccp-crypto-des3.c
@@ -182,7 +182,7 @@ static int ccp_register_des3_alg(struct list_head *head,
 	struct skcipher_alg *alg;
 	int ret;
 
-	ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+	ccp_alg = kzalloc_obj(*ccp_alg);
 	if (!ccp_alg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/ccp-crypto-rsa.c b/drivers/crypto/ccp/ccp-crypto-rsa.c
index 80d9ddc1f644..090adacaaf93 100644
--- a/drivers/crypto/ccp/ccp-crypto-rsa.c
+++ b/drivers/crypto/ccp/ccp-crypto-rsa.c
@@ -249,7 +249,7 @@ static int ccp_register_rsa_alg(struct list_head *head,
 	struct akcipher_alg *alg;
 	int ret;
 
-	ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+	ccp_alg = kzalloc_obj(*ccp_alg);
 	if (!ccp_alg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c
index 91d0d8ea182b..286b2d716236 100644
--- a/drivers/crypto/ccp/ccp-crypto-sha.c
+++ b/drivers/crypto/ccp/ccp-crypto-sha.c
@@ -418,7 +418,7 @@ static int ccp_register_hmac_alg(struct list_head *head,
 	struct crypto_alg *base;
 	int ret;
 
-	ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+	ccp_alg = kzalloc_obj(*ccp_alg);
 	if (!ccp_alg)
 		return -ENOMEM;
 
@@ -462,7 +462,7 @@ static int ccp_register_sha_alg(struct list_head *head,
 	struct crypto_alg *base;
 	int ret;
 
-	ccp_alg = kzalloc_obj(*ccp_alg, GFP_KERNEL);
+	ccp_alg = kzalloc_obj(*ccp_alg);
 	if (!ccp_alg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
index 0170edef5b43..f35803c37ab4 100644
--- a/drivers/crypto/ccp/ccp-ops.c
+++ b/drivers/crypto/ccp/ccp-ops.c
@@ -642,7 +642,7 @@ ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
 		struct ccp_data dst;
 		struct ccp_data aad;
 		struct ccp_op op;
-	} *wa __free(kfree) = kzalloc_obj(*wa, GFP_KERNEL);
+	} *wa __free(kfree) = kzalloc_obj(*wa);
 	unsigned int dm_offset;
 	unsigned int authsize;
 	unsigned int jobid;
diff --git a/drivers/crypto/ccp/hsti.c b/drivers/crypto/ccp/hsti.c
index 404829c41a13..df09e0322304 100644
--- a/drivers/crypto/ccp/hsti.c
+++ b/drivers/crypto/ccp/hsti.c
@@ -87,7 +87,7 @@ static int psp_populate_hsti(struct psp_device *psp)
 		return 0;
 
 	/* Allocate command-response buffer */
-	req = kzalloc_obj(*req, GFP_KERNEL);
+	req = kzalloc_obj(*req);
 	if (!req)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/sev-dev-tio.c b/drivers/crypto/ccp/sev-dev-tio.c
index d51bb67460b0..c84e23982b43 100644
--- a/drivers/crypto/ccp/sev-dev-tio.c
+++ b/drivers/crypto/ccp/sev-dev-tio.c
@@ -330,7 +330,7 @@ static struct sla_buffer_hdr *sla_buffer_map(struct sla_addr_t sla)
 		if (WARN_ON_ONCE(!npages))
 			return NULL;
 
-		struct page **pp = kmalloc_objs(pp[0], npages, GFP_KERNEL);
+		struct page **pp = kmalloc_objs(pp[0], npages);
 
 		if (!pp)
 			return NULL;
diff --git a/drivers/crypto/ccp/sev-dev-tsm.c b/drivers/crypto/ccp/sev-dev-tsm.c
index a3e7a9bca95b..adc9542ae806 100644
--- a/drivers/crypto/ccp/sev-dev-tsm.c
+++ b/drivers/crypto/ccp/sev-dev-tsm.c
@@ -207,7 +207,7 @@ static int stream_alloc(struct pci_dev *pdev, struct pci_ide **ide,
 
 static struct pci_tsm *tio_pf0_probe(struct pci_dev *pdev, struct sev_device *sev)
 {
-	struct tio_dsm *dsm __free(kfree) = kzalloc_obj(*dsm, GFP_KERNEL);
+	struct tio_dsm *dsm __free(kfree) = kzalloc_obj(*dsm);
 	int rc;
 
 	if (!dsm)
@@ -341,7 +341,7 @@ static struct pci_tsm_ops sev_tsm_ops = {
 
 void sev_tsm_init_locked(struct sev_device *sev, void *tio_status_page)
 {
-	struct sev_tio_status *t = kzalloc_obj(*t, GFP_KERNEL);
+	struct sev_tio_status *t = kzalloc_obj(*t);
 	struct tsm_dev *tsmdev;
 	int ret;
 
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 4dc642ecde76..096f993974d1 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -1144,7 +1144,7 @@ struct page *snp_alloc_hv_fixed_pages(unsigned int num_2mb_pages)
 	if (!page)
 		return NULL;
 
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry) {
 		__free_pages(page, order);
 		return NULL;
@@ -2658,7 +2658,7 @@ static int sev_misc_init(struct sev_device *sev)
 	if (!misc_dev) {
 		struct miscdevice *misc;
 
-		misc_dev = kzalloc_obj(*misc_dev, GFP_KERNEL);
+		misc_dev = kzalloc_obj(*misc_dev);
 		if (!misc_dev)
 			return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/sfs.c b/drivers/crypto/ccp/sfs.c
index c98900672ea8..a4777839790b 100644
--- a/drivers/crypto/ccp/sfs.c
+++ b/drivers/crypto/ccp/sfs.c
@@ -223,7 +223,7 @@ static int sfs_misc_init(struct sfs_device *sfs)
 	if (!misc_dev) {
 		struct miscdevice *misc;
 
-		misc_dev = kzalloc_obj(*misc_dev, GFP_KERNEL);
+		misc_dev = kzalloc_obj(*misc_dev);
 		if (!misc_dev)
 			return -ENOMEM;
 
diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
index 50716472586a..3e3645980e89 100644
--- a/drivers/crypto/ccp/tee-dev.c
+++ b/drivers/crypto/ccp/tee-dev.c
@@ -67,7 +67,7 @@ struct tee_init_ring_cmd *tee_alloc_cmd_buffer(struct psp_tee_device *tee)
 {
 	struct tee_init_ring_cmd *cmd;
 
-	cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+	cmd = kzalloc_obj(*cmd);
 	if (!cmd)
 		return NULL;
 
diff --git a/drivers/crypto/ccree/cc_request_mgr.c b/drivers/crypto/ccree/cc_request_mgr.c
index 31fc0d37db21..aa0220212406 100644
--- a/drivers/crypto/ccree/cc_request_mgr.c
+++ b/drivers/crypto/ccree/cc_request_mgr.c
@@ -116,7 +116,7 @@ int cc_req_mgr_init(struct cc_drvdata *drvdata)
 	struct device *dev = drvdata_to_dev(drvdata);
 	int rc = 0;
 
-	req_mgr_h = kzalloc_obj(*req_mgr_h, GFP_KERNEL);
+	req_mgr_h = kzalloc_obj(*req_mgr_h);
 	if (!req_mgr_h) {
 		rc = -ENOMEM;
 		goto req_mgr_init_err;
diff --git a/drivers/crypto/chelsio/chcr_core.c b/drivers/crypto/chelsio/chcr_core.c
index a1a0034780c5..2609a8c3c18b 100644
--- a/drivers/crypto/chelsio/chcr_core.c
+++ b/drivers/crypto/chelsio/chcr_core.c
@@ -189,7 +189,7 @@ static void *chcr_uld_add(const struct cxgb4_lld_info *lld)
 		return ERR_PTR(-EOPNOTSUPP);
 
 	/* Create the device and add it in the device list */
-	u_ctx = kzalloc_obj(*u_ctx, GFP_KERNEL);
+	u_ctx = kzalloc_obj(*u_ctx);
 	if (!u_ctx) {
 		u_ctx = ERR_PTR(-ENOMEM);
 		goto out;
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 19f0bf3f3f92..a897541f897b 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -2248,7 +2248,7 @@ static int hifn_alg_alloc(struct hifn_device *dev, const struct hifn_alg_templat
 	struct hifn_crypto_alg *alg;
 	int err;
 
-	alg = kzalloc_obj(*alg, GFP_KERNEL);
+	alg = kzalloc_obj(*alg);
 	if (!alg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/hisilicon/debugfs.c b/drivers/crypto/hisilicon/debugfs.c
index b7c5c4ade11f..32e9f8350289 100644
--- a/drivers/crypto/hisilicon/debugfs.c
+++ b/drivers/crypto/hisilicon/debugfs.c
@@ -838,7 +838,7 @@ static struct dfx_diff_registers *dfx_regs_init(struct hisi_qm *qm,
 	u32 j, base_offset;
 	int i;
 
-	diff_regs = kzalloc_objs(*diff_regs, reg_len, GFP_KERNEL);
+	diff_regs = kzalloc_objs(*diff_regs, reg_len);
 	if (!diff_regs)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 07421f53a7ee..d00a79070bac 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -2722,7 +2722,7 @@ static int qm_hw_err_isolate(struct hisi_qm *qm)
 	if (qm->uacce->is_vf || isolate->is_isolate || !isolate->err_threshold)
 		return 0;
 
-	hw_err = kzalloc_obj(*hw_err, GFP_KERNEL);
+	hw_err = kzalloc_obj(*hw_err);
 	if (!hw_err)
 		return -ENOMEM;
 
@@ -3747,7 +3747,7 @@ static int hisi_qm_sort_devices(int node, struct list_head *head,
 		if (dev_node < 0)
 			dev_node = 0;
 
-		res = kzalloc_obj(*res, GFP_KERNEL);
+		res = kzalloc_obj(*res);
 		if (!res)
 			return -ENOMEM;
 
@@ -5767,7 +5767,7 @@ static int hisi_qp_alloc_memory(struct hisi_qm *qm)
 	size_t qp_dma_size;
 	int i, ret;
 
-	qm->qp_array = kzalloc_objs(struct hisi_qp, qm->qp_num, GFP_KERNEL);
+	qm->qp_array = kzalloc_objs(struct hisi_qp, qm->qp_num);
 	if (!qm->qp_array)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c
index c8b71945f9f8..3373f9be2e42 100644
--- a/drivers/crypto/hisilicon/sec2/sec_crypto.c
+++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c
@@ -569,11 +569,11 @@ static int sec_alloc_qp_ctx_resource(struct sec_ctx *ctx, struct sec_qp_ctx *qp_
 	struct device *dev = ctx->dev;
 	int ret = -ENOMEM;
 
-	qp_ctx->req_list = kzalloc_objs(struct sec_req *, q_depth, GFP_KERNEL);
+	qp_ctx->req_list = kzalloc_objs(struct sec_req *, q_depth);
 	if (!qp_ctx->req_list)
 		return ret;
 
-	qp_ctx->res = kzalloc_objs(struct sec_alg_res, q_depth, GFP_KERNEL);
+	qp_ctx->res = kzalloc_objs(struct sec_alg_res, q_depth);
 	if (!qp_ctx->res)
 		goto err_free_req_list;
 	qp_ctx->res->depth = q_depth;
diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index a4db14adc6da..efda8646fc60 100644
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -420,7 +420,7 @@ struct hisi_qp **sec_create_qps(void)
 	u8 *type;
 	int ret;
 
-	qps = kzalloc_objs(struct hisi_qp *, ctx_num, GFP_KERNEL);
+	qps = kzalloc_objs(struct hisi_qp *, ctx_num);
 	if (!qps)
 		return NULL;
 
diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c
index ab20665cbfbc..1b26077970d4 100644
--- a/drivers/crypto/hisilicon/sgl.c
+++ b/drivers/crypto/hisilicon/sgl.c
@@ -83,7 +83,7 @@ struct hisi_acc_sgl_pool *hisi_acc_create_sgl_pool(struct device *dev,
 	    (remain_sgl > 0 && block_num > HISI_ACC_MEM_BLOCK_NR - 1))
 		return ERR_PTR(-EINVAL);
 
-	pool = kzalloc_obj(*pool, GFP_KERNEL);
+	pool = kzalloc_obj(*pool);
 	if (!pool)
 		return ERR_PTR(-ENOMEM);
 	block = pool->mem_block;
diff --git a/drivers/crypto/inside-secure/eip93/eip93-aead.c b/drivers/crypto/inside-secure/eip93/eip93-aead.c
index 8d72644fdc74..1a08aed5de13 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-aead.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-aead.c
@@ -70,7 +70,7 @@ static int eip93_aead_cra_init(struct crypto_tfm *tfm)
 	ctx->type = tmpl->type;
 	ctx->set_assoc = true;
 
-	ctx->sa_record = kzalloc_obj(*ctx->sa_record, GFP_KERNEL);
+	ctx->sa_record = kzalloc_obj(*ctx->sa_record);
 	if (!ctx->sa_record)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/inside-secure/eip93/eip93-cipher.c b/drivers/crypto/inside-secure/eip93/eip93-cipher.c
index 74f4abeba646..0713c71ab458 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-cipher.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-cipher.c
@@ -61,7 +61,7 @@ static int eip93_skcipher_cra_init(struct crypto_tfm *tfm)
 	ctx->eip93 = tmpl->eip93;
 	ctx->type = tmpl->type;
 
-	ctx->sa_record = kzalloc_obj(*ctx->sa_record, GFP_KERNEL);
+	ctx->sa_record = kzalloc_obj(*ctx->sa_record);
 	if (!ctx->sa_record)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/inside-secure/eip93/eip93-common.c b/drivers/crypto/inside-secure/eip93/eip93-common.c
index b19afd311c84..f4ad6beff15e 100644
--- a/drivers/crypto/inside-secure/eip93/eip93-common.c
+++ b/drivers/crypto/inside-secure/eip93/eip93-common.c
@@ -152,7 +152,7 @@ static int eip93_make_sg_copy(struct scatterlist *src, struct scatterlist **dst,
 {
 	void *pages;
 
-	*dst = kmalloc_obj(**dst, GFP_KERNEL);
+	*dst = kmalloc_obj(**dst);
 	if (!*dst)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 077da171fdf2..660f45ab8647 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -1889,7 +1889,7 @@ static int safexcel_pci_probe(struct pci_dev *pdev,
 		ent->vendor, ent->device, ent->subvendor,
 		ent->subdevice, ent->driver_data);
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index f84def61ceb0..3402e570d045 100644
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -2008,7 +2008,7 @@ static int safexcel_xcbcmac_cra_init(struct crypto_tfm *tfm)
 	struct safexcel_ahash_ctx *ctx = crypto_tfm_ctx(tfm);
 
 	safexcel_ahash_cra_init(tfm);
-	ctx->aes = kmalloc_obj(*ctx->aes, GFP_KERNEL);
+	ctx->aes = kmalloc_obj(*ctx->aes);
 	return ctx->aes == NULL ? -ENOMEM : 0;
 }
 
diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/intel/iaa/iaa_crypto_main.c
index bcd2bfcc19af..547abf453d4a 100644
--- a/drivers/crypto/intel/iaa/iaa_crypto_main.c
+++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c
@@ -335,7 +335,7 @@ int add_iaa_compression_mode(const char *name,
 		goto out;
 	}
 
-	mode = kzalloc_obj(*mode, GFP_KERNEL);
+	mode = kzalloc_obj(*mode);
 	if (!mode)
 		goto out;
 
@@ -422,7 +422,7 @@ static int init_device_compression_mode(struct iaa_device *iaa_device,
 	struct iaa_device_compression_mode *device_mode;
 	int ret = -ENOMEM;
 
-	device_mode = kzalloc_obj(*device_mode, GFP_KERNEL);
+	device_mode = kzalloc_obj(*device_mode);
 	if (!device_mode)
 		return -ENOMEM;
 
@@ -503,7 +503,7 @@ static struct iaa_device *iaa_device_alloc(void)
 {
 	struct iaa_device *iaa_device;
 
-	iaa_device = kzalloc_obj(*iaa_device, GFP_KERNEL);
+	iaa_device = kzalloc_obj(*iaa_device);
 	if (!iaa_device)
 		return NULL;
 
@@ -561,7 +561,7 @@ static int add_iaa_wq(struct iaa_device *iaa_device, struct idxd_wq *wq,
 	struct device *dev = &pdev->dev;
 	struct iaa_wq *iaa_wq;
 
-	iaa_wq = kzalloc_obj(*iaa_wq, GFP_KERNEL);
+	iaa_wq = kzalloc_obj(*iaa_wq);
 	if (!iaa_wq)
 		return -ENOMEM;
 
@@ -718,7 +718,7 @@ static int alloc_wq_table(int max_wqs)
 
 	for (cpu = 0; cpu < nr_cpus; cpu++) {
 		entry = per_cpu_ptr(wq_table, cpu);
-		entry->wqs = kzalloc_objs(*entry->wqs, max_wqs, GFP_KERNEL);
+		entry->wqs = kzalloc_objs(*entry->wqs, max_wqs);
 		if (!entry->wqs) {
 			free_wq_table();
 			return -ENOMEM;
diff --git a/drivers/crypto/intel/keembay/ocs-hcu.c b/drivers/crypto/intel/keembay/ocs-hcu.c
index 2c9e523361df..87711068d747 100644
--- a/drivers/crypto/intel/keembay/ocs-hcu.c
+++ b/drivers/crypto/intel/keembay/ocs-hcu.c
@@ -491,7 +491,7 @@ struct ocs_hcu_dma_list *ocs_hcu_dma_list_alloc(struct ocs_hcu_dev *hcu_dev,
 {
 	struct ocs_hcu_dma_list *dma_list;
 
-	dma_list = kmalloc_obj(*dma_list, GFP_KERNEL);
+	dma_list = kmalloc_obj(*dma_list);
 	if (!dma_list)
 		return NULL;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c b/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
index 935f4f9d8a7c..f9f1018a2823 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
@@ -178,7 +178,7 @@ int adf_ae_init(struct adf_accel_dev *accel_dev)
 	if (!hw_device->fw_name)
 		return 0;
 
-	loader_data = kzalloc_obj(*loader_data, GFP_KERNEL);
+	loader_data = kzalloc_obj(*loader_data);
 	if (!loader_data)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_aer.c b/drivers/crypto/intel/qat/qat_common/adf_aer.c
index a65e88d28f53..ed01fb9ad74e 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_aer.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_aer.c
@@ -160,7 +160,7 @@ static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,
 		return 0;
 
 	set_bit(ADF_STATUS_RESTARTING, &accel_dev->status);
-	reset_data = kzalloc_obj(*reset_data, GFP_KERNEL);
+	reset_data = kzalloc_obj(*reset_data);
 	if (!reset_data)
 		return -ENOMEM;
 	reset_data->accel_dev = accel_dev;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_cfg.c b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
index c348d290fc51..c202209f17d5 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_cfg.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
@@ -68,7 +68,7 @@ int adf_cfg_dev_add(struct adf_accel_dev *accel_dev)
 {
 	struct adf_cfg_device_data *dev_cfg_data;
 
-	dev_cfg_data = kzalloc_obj(*dev_cfg_data, GFP_KERNEL);
+	dev_cfg_data = kzalloc_obj(*dev_cfg_data);
 	if (!dev_cfg_data)
 		return -ENOMEM;
 	INIT_LIST_HEAD(&dev_cfg_data->sec_list);
@@ -289,7 +289,7 @@ int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,
 	if (!section)
 		return -EFAULT;
 
-	key_val = kzalloc_obj(*key_val, GFP_KERNEL);
+	key_val = kzalloc_obj(*key_val);
 	if (!key_val)
 		return -ENOMEM;
 
@@ -356,7 +356,7 @@ int adf_cfg_section_add(struct adf_accel_dev *accel_dev, const char *name)
 	if (sec)
 		return 0;
 
-	sec = kzalloc_obj(*sec, GFP_KERNEL);
+	sec = kzalloc_obj(*sec);
 	if (!sec)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
index 2068fe29a24c..e050de16ab5d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
@@ -172,7 +172,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
 			goto unlock;
 		}
 		num_devices++;
-		map = kzalloc_obj(*map, GFP_KERNEL);
+		map = kzalloc_obj(*map);
 		if (!map) {
 			ret = -ENOMEM;
 			goto unlock;
@@ -204,7 +204,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
 			goto unlock;
 		}
 
-		map = kzalloc_obj(*map, GFP_KERNEL);
+		map = kzalloc_obj(*map);
 		if (!map) {
 			ret = -ENOMEM;
 			goto unlock;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c b/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
index 622da38ce385..bf2bae78a40d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
@@ -59,7 +59,7 @@ static int adf_gen4_vfmig_open_device(struct qat_mig_dev *mdev)
 
 	vf_info = &accel_dev->pf.vf_info[mdev->vf_id];
 
-	vfmig = kzalloc_obj(*vfmig, GFP_KERNEL);
+	vfmig = kzalloc_obj(*vfmig);
 	if (!vfmig)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c b/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
index 95a9efceda6d..0cdb4241f04b 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
@@ -281,7 +281,7 @@ int adf_heartbeat_init(struct adf_accel_dev *accel_dev)
 {
 	struct adf_heartbeat *hb;
 
-	hb = kzalloc_obj(*hb, GFP_KERNEL);
+	hb = kzalloc_obj(*hb);
 	if (!hb)
 		goto err_ret;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c b/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
index 1fbade552370..f9017e03ec0f 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
@@ -37,7 +37,7 @@ struct adf_mstate_mgr *adf_mstate_mgr_new(u8 *buf, u32 size)
 {
 	struct adf_mstate_mgr *mgr;
 
-	mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+	mgr = kzalloc_obj(*mgr);
 	if (!mgr)
 		return NULL;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_rl.c b/drivers/crypto/intel/qat/qat_common/adf_rl.c
index 2e037df286cc..997ef448a4df 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_rl.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_rl.c
@@ -622,7 +622,7 @@ static int add_new_sla_entry(struct adf_accel_dev *accel_dev,
 	struct rl_sla *sla;
 	int ret = 0;
 
-	sla = kzalloc_obj(*sla, GFP_KERNEL);
+	sla = kzalloc_obj(*sla);
 	if (!sla) {
 		ret = -ENOMEM;
 		goto ret_err;
@@ -1065,7 +1065,7 @@ int adf_rl_init(struct adf_accel_dev *accel_dev)
 		goto err_ret;
 	}
 
-	rl = kzalloc_obj(*rl, GFP_KERNEL);
+	rl = kzalloc_obj(*rl);
 	if (!rl) {
 		ret = -ENOMEM;
 		goto err_ret;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_timer.c b/drivers/crypto/intel/qat/qat_common/adf_timer.c
index 3f5267c98ff3..cee965f9368d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_timer.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_timer.c
@@ -40,7 +40,7 @@ int adf_timer_start(struct adf_accel_dev *accel_dev)
 {
 	struct adf_timer *timer_ctx;
 
-	timer_ctx = kzalloc_obj(*timer_ctx, GFP_KERNEL);
+	timer_ctx = kzalloc_obj(*timer_ctx);
 	if (!timer_ctx)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c b/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
index a27f1d76998e..a8f853516a3f 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
@@ -99,7 +99,7 @@ int adf_ring_debugfs_add(struct adf_etr_ring_data *ring, const char *name)
 	struct adf_etr_ring_debug_entry *ring_debug;
 	char entry_name[16];
 
-	ring_debug = kzalloc_obj(*ring_debug, GFP_KERNEL);
+	ring_debug = kzalloc_obj(*ring_debug);
 	if (!ring_debug)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/qat_hal.c b/drivers/crypto/intel/qat/qat_common/qat_hal.c
index 86523a70b3a9..7a6ba6f22e3e 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_hal.c
@@ -832,17 +832,17 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
 	struct icp_qat_fw_loader_handle *handle;
 	int ret = 0;
 
-	handle = kzalloc_obj(*handle, GFP_KERNEL);
+	handle = kzalloc_obj(*handle);
 	if (!handle)
 		return -ENOMEM;
 
-	handle->hal_handle = kzalloc_obj(*handle->hal_handle, GFP_KERNEL);
+	handle->hal_handle = kzalloc_obj(*handle->hal_handle);
 	if (!handle->hal_handle) {
 		ret = -ENOMEM;
 		goto out_hal_handle;
 	}
 
-	handle->chip_info = kzalloc_obj(*handle->chip_info, GFP_KERNEL);
+	handle->chip_info = kzalloc_obj(*handle->chip_info);
 	if (!handle->chip_info) {
 		ret = -ENOMEM;
 		goto out_chip_info;
diff --git a/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c b/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
index 4fb4b0cac64e..3869ada0190d 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
@@ -24,7 +24,7 @@ struct qat_mig_dev *qat_vfmig_create(struct pci_dev *pdev, int vf_id)
 	    !ops->load_state || !ops->save_setup || !ops->load_setup)
 		return ERR_PTR(-EINVAL);
 
-	mdev = kmalloc_obj(*mdev, GFP_KERNEL);
+	mdev = kmalloc_obj(*mdev);
 	if (!mdev)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
index be0cfd9dd09a..30f83f06d185 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
@@ -42,10 +42,10 @@ static int qat_uclo_init_ae_data(struct icp_qat_uclo_objhandle *obj_handle,
 	} else {
 		ae_slice->ctx_mask_assigned = 0;
 	}
-	ae_slice->region = kzalloc_obj(*ae_slice->region, GFP_KERNEL);
+	ae_slice->region = kzalloc_obj(*ae_slice->region);
 	if (!ae_slice->region)
 		return -ENOMEM;
-	ae_slice->page = kzalloc_obj(*ae_slice->page, GFP_KERNEL);
+	ae_slice->page = kzalloc_obj(*ae_slice->page);
 	if (!ae_slice->page)
 		goto out_err;
 	page = ae_slice->page;
@@ -258,7 +258,7 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle
 
 	init_header = *init_tab_base;
 	if (!init_header) {
-		init_header = kzalloc_obj(*init_header, GFP_KERNEL);
+		init_header = kzalloc_obj(*init_header);
 		if (!init_header)
 			return -ENOMEM;
 		init_header->size = 1;
@@ -270,7 +270,7 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle
 		tail_old = tail_old->next;
 	tail = tail_old;
 	for (i = 0; i < init_mem->val_attr_num; i++) {
-		mem_init = kzalloc_obj(*mem_init, GFP_KERNEL);
+		mem_init = kzalloc_obj(*mem_init);
 		if (!mem_init)
 			goto out_err;
 		mem_init->ae = ae;
@@ -501,7 +501,7 @@ qat_uclo_map_chunk(char *buf, struct icp_qat_uof_filehdr *file_hdr,
 			if (file_chunk->checksum != qat_uclo_calc_str_checksum(
 				chunk, file_chunk->size))
 				break;
-			obj_hdr = kzalloc_obj(*obj_hdr, GFP_KERNEL);
+			obj_hdr = kzalloc_obj(*obj_hdr);
 			if (!obj_hdr)
 				break;
 			obj_hdr->file_buff = chunk;
@@ -634,7 +634,7 @@ static int qat_uclo_map_uimage(struct icp_qat_uclo_objhandle *obj_handle,
 		if (qat_uclo_check_image_compat(encap_uof_obj, image))
 			goto out_err;
 		ae_uimage[j].page =
-			kzalloc_obj(struct icp_qat_uclo_encap_page, GFP_KERNEL);
+			kzalloc_obj(struct icp_qat_uclo_encap_page);
 		if (!ae_uimage[j].page)
 			goto out_err;
 		qat_uclo_map_image_page(encap_uof_obj, image,
@@ -1719,7 +1719,7 @@ static int qat_uclo_map_suof_obj(struct icp_qat_fw_loader_handle *handle,
 {
 	struct icp_qat_suof_handle *suof_handle;
 
-	suof_handle = kzalloc_obj(*suof_handle, GFP_KERNEL);
+	suof_handle = kzalloc_obj(*suof_handle);
 	if (!suof_handle)
 		return -ENOMEM;
 	handle->sobj_handle = suof_handle;
@@ -1763,7 +1763,7 @@ static int qat_uclo_map_uof_obj(struct icp_qat_fw_loader_handle *handle,
 	struct icp_qat_uof_filehdr *filehdr;
 	struct icp_qat_uclo_objhandle *objhdl;
 
-	objhdl = kzalloc_obj(*objhdl, GFP_KERNEL);
+	objhdl = kzalloc_obj(*objhdl);
 	if (!objhdl)
 		return -ENOMEM;
 	objhdl->obj_buf = kmemdup(addr_ptr, mem_size, GFP_KERNEL);
@@ -2003,7 +2003,7 @@ static int qat_uclo_map_mof_obj(struct icp_qat_fw_loader_handle *handle,
 	if (qat_uclo_check_mof_format(mof_ptr))
 		return -EINVAL;
 
-	mobj_handle = kzalloc_obj(*mobj_handle, GFP_KERNEL);
+	mobj_handle = kzalloc_obj(*mobj_handle);
 	if (!mobj_handle)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
index b35c57a868e7..09e6a8474d1a 100644
--- a/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
@@ -318,7 +318,7 @@ static int process_tar_file(struct device *dev,
 		return -EINVAL;
 	}
 
-	tar_info = kzalloc_obj(struct tar_ucode_info_t, GFP_KERNEL);
+	tar_info = kzalloc_obj(struct tar_ucode_info_t);
 	if (!tar_info)
 		return -ENOMEM;
 
@@ -412,7 +412,7 @@ static struct tar_arch_info_t *load_tar_archive(struct device *dev,
 	size_t tar_size;
 	int ret;
 
-	tar_arch = kzalloc_obj(struct tar_arch_info_t, GFP_KERNEL);
+	tar_arch = kzalloc_obj(struct tar_arch_info_t);
 	if (!tar_arch)
 		return NULL;
 
diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
index 32f6616a60eb..587609db6c69 100644
--- a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
@@ -31,7 +31,7 @@ static int init_worker_threads(struct otx_cptvf *cptvf)
 	struct otx_cptvf_wqe_info *cwqe_info;
 	int i;
 
-	cwqe_info = kzalloc_obj(*cwqe_info, GFP_KERNEL);
+	cwqe_info = kzalloc_obj(*cwqe_info);
 	if (!cwqe_info)
 		return -ENOMEM;
 
@@ -100,7 +100,7 @@ static int alloc_pending_queues(struct otx_cpt_pending_qinfo *pqinfo, u32 qlen,
 	pqinfo->num_queues = num_queues;
 
 	for_each_pending_queue(pqinfo, queue, i) {
-		queue->head = kzalloc_objs(*queue->head, qlen, GFP_KERNEL);
+		queue->head = kzalloc_objs(*queue->head, qlen);
 		if (!queue->head) {
 			ret = -ENOMEM;
 			goto pending_qfail;
@@ -212,7 +212,7 @@ static int alloc_command_queues(struct otx_cptvf *cptvf,
 		queue = &cqinfo->queue[i];
 		INIT_LIST_HEAD(&queue->chead);
 		do {
-			curr = kzalloc_obj(*curr, GFP_KERNEL);
+			curr = kzalloc_obj(*curr);
 			if (!curr)
 				goto cmd_qfail;
 
diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
index 97d948fbc4b3..9b0887d7e62c 100644
--- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
@@ -372,7 +372,7 @@ static int load_fw(struct device *dev, struct fw_info_t *fw_info,
 	int ucode_type, ucode_size;
 	int ret;
 
-	uc_info = kzalloc_obj(*uc_info, GFP_KERNEL);
+	uc_info = kzalloc_obj(*uc_info);
 	if (!uc_info)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
index bec0a4cd2662..858f851c9c8a 100644
--- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
@@ -150,7 +150,7 @@ static int init_tasklet_work(struct otx2_cptlfs_info *lfs)
 	int i, ret = 0;
 
 	for (i = 0; i < lfs->lfs_num; i++) {
-		wqe = kzalloc_obj(struct otx2_cptlf_wqe, GFP_KERNEL);
+		wqe = kzalloc_obj(struct otx2_cptlf_wqe);
 		if (!wqe) {
 			ret = -ENOMEM;
 			goto cleanup_tasklet;
diff --git a/drivers/crypto/nx/nx-842.c b/drivers/crypto/nx/nx-842.c
index f388027b1256..b61f2545e165 100644
--- a/drivers/crypto/nx/nx-842.c
+++ b/drivers/crypto/nx/nx-842.c
@@ -105,7 +105,7 @@ void *nx842_crypto_alloc_ctx(struct nx842_driver *driver)
 {
 	struct nx842_crypto_ctx *ctx;
 
-	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx);
 	if (!ctx)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/crypto/nx/nx-common-powernv.c b/drivers/crypto/nx/nx-common-powernv.c
index a9253e34a0e5..d6185740ff93 100644
--- a/drivers/crypto/nx/nx-common-powernv.c
+++ b/drivers/crypto/nx/nx-common-powernv.c
@@ -810,7 +810,7 @@ static int __init vas_cfg_coproc_info(struct device_node *dn, int chip_id,
 		return ret;
 	}
 
-	coproc = kzalloc_obj(*coproc, GFP_KERNEL);
+	coproc = kzalloc_obj(*coproc);
 	if (!coproc)
 		return -ENOMEM;
 
@@ -968,7 +968,7 @@ static int __init nx842_powernv_probe(struct device_node *dn)
 		return -EINVAL;
 	}
 
-	coproc = kzalloc_obj(*coproc, GFP_KERNEL);
+	coproc = kzalloc_obj(*coproc);
 	if (!coproc)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/nx/nx-common-pseries.c b/drivers/crypto/nx/nx-common-pseries.c
index ecf84448b797..a6e65c3d2873 100644
--- a/drivers/crypto/nx/nx-common-pseries.c
+++ b/drivers/crypto/nx/nx-common-pseries.c
@@ -1148,7 +1148,7 @@ static void __init nxcop_get_capabilities(void)
 	u64 feat;
 	int rc;
 
-	hv_caps = kmalloc_obj(*hv_caps, GFP_KERNEL);
+	hv_caps = kmalloc_obj(*hv_caps);
 	if (!hv_caps)
 		return;
 	/*
@@ -1167,7 +1167,7 @@ static void __init nxcop_get_capabilities(void)
 	/*
 	 * NX-GZIP feature available
 	 */
-	hv_nxc = kmalloc_obj(*hv_nxc, GFP_KERNEL);
+	hv_nxc = kmalloc_obj(*hv_nxc);
 	if (!hv_nxc)
 		return;
 	/*
@@ -1217,7 +1217,7 @@ static int __init nx842_pseries_init(void)
 	of_node_put(np);
 
 	RCU_INIT_POINTER(devdata, NULL);
-	new_devdata = kzalloc_obj(*new_devdata, GFP_KERNEL);
+	new_devdata = kzalloc_obj(*new_devdata);
 	if (!new_devdata)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/omap-crypto.c b/drivers/crypto/omap-crypto.c
index 441f0e5eb458..7bd6869c2b21 100644
--- a/drivers/crypto/omap-crypto.c
+++ b/drivers/crypto/omap-crypto.c
@@ -21,7 +21,7 @@ static int omap_crypto_copy_sg_lists(int total, int bs,
 	struct scatterlist *tmp;
 
 	if (!(flags & OMAP_CRYPTO_FORCE_SINGLE_ENTRY)) {
-		new_sg = kmalloc_objs(*new_sg, n, GFP_KERNEL);
+		new_sg = kmalloc_objs(*new_sg, n);
 		if (!new_sg)
 			return -ENOMEM;
 
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 48f6ba92ee93..6a3c7f9277cf 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -636,7 +636,7 @@ static int omap_sham_copy_sg_lists(struct omap_sham_reqctx *ctx,
 	if (ctx->bufcnt)
 		n++;
 
-	ctx->sg = kmalloc_objs(*sg, n, GFP_KERNEL);
+	ctx->sg = kmalloc_objs(*sg, n);
 	if (!ctx->sg)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/qce/aead.c b/drivers/crypto/qce/aead.c
index ffc31a1d72c5..846e1d42775d 100644
--- a/drivers/crypto/qce/aead.c
+++ b/drivers/crypto/qce/aead.c
@@ -762,7 +762,7 @@ static int qce_aead_register_one(const struct qce_aead_def *def, struct qce_devi
 	struct aead_alg *alg;
 	int ret;
 
-	tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+	tmpl = kzalloc_obj(*tmpl);
 	if (!tmpl)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c
index f09d0d7da518..402e4e64347d 100644
--- a/drivers/crypto/qce/sha.c
+++ b/drivers/crypto/qce/sha.c
@@ -457,7 +457,7 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def,
 	struct crypto_alg *base;
 	int ret;
 
-	tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+	tmpl = kzalloc_obj(*tmpl);
 	if (!tmpl)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c
index 1571ede06b86..4ad3a1702010 100644
--- a/drivers/crypto/qce/skcipher.c
+++ b/drivers/crypto/qce/skcipher.c
@@ -440,7 +440,7 @@ static int qce_skcipher_register_one(const struct qce_skcipher_def *def,
 	struct skcipher_alg *alg;
 	int ret;
 
-	tmpl = kzalloc_obj(*tmpl, GFP_KERNEL);
+	tmpl = kzalloc_obj(*tmpl);
 	if (!tmpl)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index ea13b0fd4d89..eece1ff6c62f 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -1056,7 +1056,7 @@ static int s5p_hash_copy_sg_lists(struct s5p_hash_reqctx *ctx,
 	if (ctx->bufcnt)
 		n++;
 
-	ctx->sg = kmalloc_objs(*sg, n, GFP_KERNEL);
+	ctx->sg = kmalloc_objs(*sg, n);
 	if (!ctx->sg) {
 		ctx->error = true;
 		return -ENOMEM;
diff --git a/drivers/crypto/tegra/tegra-se-main.c b/drivers/crypto/tegra/tegra-se-main.c
index caca5e365f8b..eb71113ed146 100644
--- a/drivers/crypto/tegra/tegra-se-main.c
+++ b/drivers/crypto/tegra/tegra-se-main.c
@@ -47,7 +47,7 @@ tegra_se_cmdbuf_pin(struct device *dev, struct host1x_bo *bo, enum dma_data_dire
 	struct host1x_bo_mapping *map;
 	int err;
 
-	map = kzalloc_obj(*map, GFP_KERNEL);
+	map = kzalloc_obj(*map);
 	if (!map)
 		return ERR_PTR(-ENOMEM);
 
@@ -56,7 +56,7 @@ tegra_se_cmdbuf_pin(struct device *dev, struct host1x_bo *bo, enum dma_data_dire
 	map->direction = direction;
 	map->dev = dev;
 
-	map->sgt = kzalloc_obj(*map->sgt, GFP_KERNEL);
+	map->sgt = kzalloc_obj(*map->sgt);
 	if (!map->sgt) {
 		err = -ENOMEM;
 		goto free;
@@ -123,7 +123,7 @@ static struct tegra_se_cmdbuf *tegra_se_host1x_bo_alloc(struct tegra_se *se, ssi
 	struct tegra_se_cmdbuf *cmdbuf;
 	struct device *dev = se->dev->parent;
 
-	cmdbuf = kzalloc_obj(*cmdbuf, GFP_KERNEL);
+	cmdbuf = kzalloc_obj(*cmdbuf);
 	if (!cmdbuf)
 		return NULL;
 
diff --git a/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c b/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
index 01077166b2f1..d8d452cac391 100644
--- a/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
+++ b/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
@@ -112,7 +112,7 @@ static int virtio_crypto_alg_akcipher_init_session(struct virtio_crypto_akcipher
 	if (!pkey)
 		return -ENOMEM;
 
-	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
 	if (!vc_ctrl_req) {
 		err = -ENOMEM;
 		goto out;
@@ -169,7 +169,7 @@ static int virtio_crypto_alg_akcipher_close_session(struct virtio_crypto_akciphe
 	if (!ctx->session_valid)
 		return 0;
 
-	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
 	if (!vc_ctrl_req)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c
index ae100e315185..a3cdcf67886b 100644
--- a/drivers/crypto/virtio/virtio_crypto_core.c
+++ b/drivers/crypto/virtio/virtio_crypto_core.c
@@ -115,10 +115,10 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi)
 	total_vqs = vi->max_data_queues + 1;
 
 	/* Allocate space for find_vqs parameters */
-	vqs = kzalloc_objs(*vqs, total_vqs, GFP_KERNEL);
+	vqs = kzalloc_objs(*vqs, total_vqs);
 	if (!vqs)
 		goto err_vq;
-	vqs_info = kzalloc_objs(*vqs_info, total_vqs, GFP_KERNEL);
+	vqs_info = kzalloc_objs(*vqs_info, total_vqs);
 	if (!vqs_info)
 		goto err_vqs_info;
 
diff --git a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c
index b25b7982c942..e82fc16cab25 100644
--- a/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c
+++ b/drivers/crypto/virtio/virtio_crypto_skcipher_algs.c
@@ -131,7 +131,7 @@ static int virtio_crypto_alg_skcipher_init_session(
 	if (!cipher_key)
 		return -ENOMEM;
 
-	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
 	if (!vc_ctrl_req) {
 		err = -ENOMEM;
 		goto out;
@@ -200,7 +200,7 @@ static int virtio_crypto_alg_skcipher_close_session(
 	struct virtio_crypto_inhdr *ctrl_status;
 	struct virtio_crypto_ctrl_request *vc_ctrl_req;
 
-	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req, GFP_KERNEL);
+	vc_ctrl_req = kzalloc_obj(*vc_ctrl_req);
 	if (!vc_ctrl_req)
 		return -ENOMEM;