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>

38 files changed, 58 insertions, 58 deletions

diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index f10aa0aab8d3..c20f685e56f9 100644
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -188,7 +188,7 @@ static int __init meson_gx_socinfo_init(void)
 		return -EINVAL;
 	}
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return -ENODEV;
 
diff --git a/drivers/soc/amlogic/meson-mx-socinfo.c b/drivers/soc/amlogic/meson-mx-socinfo.c
index e9003fd55294..e1a7795a2733 100644
--- a/drivers/soc/amlogic/meson-mx-socinfo.c
+++ b/drivers/soc/amlogic/meson-mx-socinfo.c
@@ -146,7 +146,7 @@ static int __init meson_mx_socinfo_init(void)
 	if (ret < 0)
 		return ret;
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return -ENODEV;
 
diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c
index 0cde365c75bb..a3fdac8f6f06 100644
--- a/drivers/soc/apple/rtkit.c
+++ b/drivers/soc/apple/rtkit.c
@@ -667,7 +667,7 @@ struct apple_rtkit *apple_rtkit_init(struct device *dev, void *cookie,
 	if (!ops)
 		return ERR_PTR(-EINVAL);
 
-	rtk = kzalloc_obj(*rtk, GFP_KERNEL);
+	rtk = kzalloc_obj(*rtk);
 	if (!rtk)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/soc/aspeed/aspeed-p2a-ctrl.c b/drivers/soc/aspeed/aspeed-p2a-ctrl.c
index bbab8dabd940..d88abc5f195b 100644
--- a/drivers/soc/aspeed/aspeed-p2a-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-p2a-ctrl.c
@@ -238,7 +238,7 @@ static int aspeed_p2a_open(struct inode *inode, struct file *file)
 {
 	struct aspeed_p2a_user *priv;
 
-	priv = kmalloc_obj(*priv, GFP_KERNEL);
+	priv = kmalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/soc/aspeed/aspeed-socinfo.c b/drivers/soc/aspeed/aspeed-socinfo.c
index b4009164c84c..5e34e01ad26d 100644
--- a/drivers/soc/aspeed/aspeed-socinfo.c
+++ b/drivers/soc/aspeed/aspeed-socinfo.c
@@ -113,7 +113,7 @@ static int __init aspeed_socinfo_init(void)
 	}
 	of_node_put(np);
 
-	attrs = kzalloc_obj(*attrs, GFP_KERNEL);
+	attrs = kzalloc_obj(*attrs);
 	if (!attrs)
 		return -ENODEV;
 
diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
index 88de5aa41191..d89f9dcade7d 100644
--- a/drivers/soc/atmel/soc.c
+++ b/drivers/soc/atmel/soc.c
@@ -368,7 +368,7 @@ struct soc_device * __init at91_soc_init(const struct at91_soc *socs)
 		return NULL;
 	}
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return NULL;
 
diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c
index e9cf6897d8bf..2da79bd42930 100644
--- a/drivers/soc/bcm/brcmstb/common.c
+++ b/drivers/soc/bcm/brcmstb/common.c
@@ -82,7 +82,7 @@ static int __init brcmstb_soc_device_init(void)
 	if (!sun_top_ctrl)
 		return ret;
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr) {
 		ret = -ENOMEM;
 		goto out;
diff --git a/drivers/soc/cirrus/soc-ep93xx.c b/drivers/soc/cirrus/soc-ep93xx.c
index d42813382977..d55cf28ed726 100644
--- a/drivers/soc/cirrus/soc-ep93xx.c
+++ b/drivers/soc/cirrus/soc-ep93xx.c
@@ -92,7 +92,7 @@ static struct auxiliary_device __init *ep93xx_adev_alloc(struct device *parent,
 	struct auxiliary_device *adev;
 	int ret;
 
-	rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+	rdev = kzalloc_obj(*rdev);
 	if (!rdev)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c
index 64b05aa80d2c..611caaeed8fc 100644
--- a/drivers/soc/dove/pmu.c
+++ b/drivers/soc/dove/pmu.c
@@ -311,7 +311,7 @@ int __init dove_init_pmu_legacy(const struct dove_pmu_initdata *initdata)
 	struct pmu_data *pmu;
 	int ret;
 
-	pmu = kzalloc_obj(*pmu, GFP_KERNEL);
+	pmu = kzalloc_obj(*pmu);
 	if (!pmu)
 		return -ENOMEM;
 
@@ -324,7 +324,7 @@ int __init dove_init_pmu_legacy(const struct dove_pmu_initdata *initdata)
 	     domain_initdata++) {
 		struct pmu_domain *domain;
 
-		domain = kzalloc_obj(*domain, GFP_KERNEL);
+		domain = kzalloc_obj(*domain);
 		if (domain) {
 			domain->pmu = pmu;
 			domain->pwr_mask = domain_initdata->pwr_mask;
@@ -386,7 +386,7 @@ int __init dove_init_pmu(void)
 		return 0;
 	}
 
-	pmu = kzalloc_obj(*pmu, GFP_KERNEL);
+	pmu = kzalloc_obj(*pmu);
 	if (!pmu)
 		return -ENOMEM;
 
@@ -408,7 +408,7 @@ int __init dove_init_pmu(void)
 		struct of_phandle_args args;
 		struct pmu_domain *domain;
 
-		domain = kzalloc_obj(*domain, GFP_KERNEL);
+		domain = kzalloc_obj(*domain);
 		if (!domain)
 			break;
 
diff --git a/drivers/soc/fsl/dpaa2-console.c b/drivers/soc/fsl/dpaa2-console.c
index 841e0510151c..7f2ffe38dc07 100644
--- a/drivers/soc/fsl/dpaa2-console.c
+++ b/drivers/soc/fsl/dpaa2-console.c
@@ -111,7 +111,7 @@ static int dpaa2_generic_console_open(struct inode *node, struct file *fp,
 	u64 base_addr;
 	int err;
 
-	cd = kmalloc_obj(*cd, GFP_KERNEL);
+	cd = kmalloc_obj(*cd);
 	if (!cd)
 		return -ENOMEM;
 
diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index 2a73d4e846ff..317ca50b0c2b 100644
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -133,7 +133,7 @@ static void dpaa2_io_dim_work(struct work_struct *w)
 struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc,
 				 struct device *dev)
 {
-	struct dpaa2_io *obj = kmalloc_obj(*obj, GFP_KERNEL);
+	struct dpaa2_io *obj = kmalloc_obj(*obj);
 	u32 qman_256_cycles_per_ns;
 
 	if (!obj)
@@ -523,7 +523,7 @@ int dpaa2_io_service_enqueue_multiple_desc_fq(struct dpaa2_io *d,
 	struct qbman_eq_desc *ed;
 	int i, ret;
 
-	ed = kzalloc_objs(struct qbman_eq_desc, 32, GFP_KERNEL);
+	ed = kzalloc_objs(struct qbman_eq_desc, 32);
 	if (!ed)
 		return -ENOMEM;
 
@@ -658,7 +658,7 @@ struct dpaa2_io_store *dpaa2_io_store_create(unsigned int max_frames,
 	if (!max_frames || (max_frames > 32))
 		return NULL;
 
-	ret = kmalloc_obj(*ret, GFP_KERNEL);
+	ret = kmalloc_obj(*ret);
 	if (!ret)
 		return NULL;
 
diff --git a/drivers/soc/fsl/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c
index b6adc87f473a..278e25d09be2 100644
--- a/drivers/soc/fsl/dpio/qbman-portal.c
+++ b/drivers/soc/fsl/dpio/qbman-portal.c
@@ -246,7 +246,7 @@ static inline u8 qm_cyc_diff(u8 ringsize, u8 first, u8 last)
  */
 struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d)
 {
-	struct qbman_swp *p = kzalloc_obj(*p, GFP_KERNEL);
+	struct qbman_swp *p = kzalloc_obj(*p);
 	u32 reg;
 	u32 mask_size;
 	u32 eqcr_pi;
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index 055d0b61ea1d..40afb27b582b 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -213,7 +213,7 @@ static int __init fsl_guts_init(void)
 	of_node_put(np);
 
 	/* Register soc device */
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return -ENOMEM;
 
diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c
index 8993cf2d47b5..f22eff294122 100644
--- a/drivers/soc/fsl/qbman/bman.c
+++ b/drivers/soc/fsl/qbman/bman.c
@@ -700,7 +700,7 @@ struct bman_pool *bman_new_pool(void)
 	if (bm_alloc_bpid_range(&bpid, 1))
 		return NULL;
 
-	pool = kmalloc_obj(*pool, GFP_KERNEL);
+	pool = kmalloc_obj(*pool);
 	if (!pool)
 		goto err;
 
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index 210438ea923e..411381f1a1c4 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -1270,7 +1270,7 @@ static int qman_create_portal(struct qman_portal *portal,
 	qm_dqrr_set_ithresh(p, QMAN_PIRQ_DQRR_ITHRESH);
 	qm_mr_set_ithresh(p, QMAN_PIRQ_MR_ITHRESH);
 	qm_out(p, QM_REG_ITPR, QMAN_PIRQ_IPERIOD);
-	portal->cgrs = kmalloc_objs(*portal->cgrs, 2, GFP_KERNEL);
+	portal->cgrs = kmalloc_objs(*portal->cgrs, 2);
 	if (!portal->cgrs)
 		goto fail_cgrs;
 	/* initial snapshot is no-depletion */
diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
index 488770405e99..66828f2a3577 100644
--- a/drivers/soc/fsl/qe/gpio.c
+++ b/drivers/soc/fsl/qe/gpio.c
@@ -161,7 +161,7 @@ struct qe_pin *qe_pin_request(struct device *dev, int index)
 	int gpio_num;
 	int err;
 
-	qe_pin = kzalloc_obj(*qe_pin, GFP_KERNEL);
+	qe_pin = kzalloc_obj(*qe_pin);
 	if (!qe_pin) {
 		dev_dbg(dev, "%s: can't allocate memory\n", __func__);
 		return ERR_PTR(-ENOMEM);
diff --git a/drivers/soc/fsl/qe/ucc_fast.c b/drivers/soc/fsl/qe/ucc_fast.c
index 3cb45090fe74..fa474dfcca13 100644
--- a/drivers/soc/fsl/qe/ucc_fast.c
+++ b/drivers/soc/fsl/qe/ucc_fast.c
@@ -191,7 +191,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
 		return -EINVAL;
 	}
 
-	uccf = kzalloc_obj(struct ucc_fast_private, GFP_KERNEL);
+	uccf = kzalloc_obj(struct ucc_fast_private);
 	if (!uccf) {
 		printk(KERN_ERR "%s: Cannot allocate private data\n",
 			__func__);
diff --git a/drivers/soc/fsl/qe/ucc_slow.c b/drivers/soc/fsl/qe/ucc_slow.c
index 335c8629a316..7c5dc7de54d5 100644
--- a/drivers/soc/fsl/qe/ucc_slow.c
+++ b/drivers/soc/fsl/qe/ucc_slow.c
@@ -148,7 +148,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
 		return -EINVAL;
 	}
 
-	uccs = kzalloc_obj(struct ucc_slow_private, GFP_KERNEL);
+	uccs = kzalloc_obj(struct ucc_slow_private);
 	if (!uccs) {
 		printk(KERN_ERR "%s: Cannot allocate private data\n",
 			__func__);
diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c
index 62e3b86fa42d..2af3bfda313e 100644
--- a/drivers/soc/hisilicon/kunpeng_hccs.c
+++ b/drivers/soc/hisilicon/kunpeng_hccs.c
@@ -616,7 +616,7 @@ static int hccs_get_all_port_info_on_die(struct hccs_dev *hdev,
 	int ret;
 	u8 i;
 
-	attrs = kzalloc_objs(struct hccs_port_attr, die->port_num, GFP_KERNEL);
+	attrs = kzalloc_objs(struct hccs_port_attr, die->port_num);
 	if (!attrs)
 		return -ENOMEM;
 
diff --git a/drivers/soc/imx/soc-imx.c b/drivers/soc/imx/soc-imx.c
index 5d39cc3f5e7d..504ebce18793 100644
--- a/drivers/soc/imx/soc-imx.c
+++ b/drivers/soc/imx/soc-imx.c
@@ -40,7 +40,7 @@ static int __init imx_soc_device_init(void)
 	if (!__mxc_cpu_type)
 		return 0;
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return -ENOMEM;
 
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index a0f14aa28106..f8ee6c9ade89 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -114,7 +114,7 @@ struct cmdq_client *cmdq_mbox_create(struct device *dev, int index)
 {
 	struct cmdq_client *client;
 
-	client = kzalloc_obj(*client, GFP_KERNEL);
+	client = kzalloc_obj(*client);
 	if (!client)
 		return (struct cmdq_client *)-ENOMEM;
 
diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c
index 4ce94066a5a8..8e7ae3cb92ff 100644
--- a/drivers/soc/microchip/mpfs-sys-controller.c
+++ b/drivers/soc/microchip/mpfs-sys-controller.c
@@ -132,7 +132,7 @@ static int mpfs_sys_controller_probe(struct platform_device *pdev)
 	struct device_node *np;
 	int i, ret;
 
-	sys_controller = kzalloc_obj(*sys_controller, GFP_KERNEL);
+	sys_controller = kzalloc_obj(*sys_controller);
 	if (!sys_controller)
 		return -ENOMEM;
 
diff --git a/drivers/soc/nuvoton/wpcm450-soc.c b/drivers/soc/nuvoton/wpcm450-soc.c
index dc1242bda713..5511bd284773 100644
--- a/drivers/soc/nuvoton/wpcm450-soc.c
+++ b/drivers/soc/nuvoton/wpcm450-soc.c
@@ -74,7 +74,7 @@ static int __init wpcm450_soc_init(void)
 		return -ENODEV;
 	}
 
-	attr = kzalloc_obj(*attr, GFP_KERNEL);
+	attr = kzalloc_obj(*attr);
 	if (!attr)
 		return -ENOMEM;
 
diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c
index 2c46a25abb24..78e72379a6e0 100644
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
@@ -95,7 +95,7 @@ gpr_port_t *gpr_alloc_port(struct apr_device *gdev, struct device *dev,
 	struct pkt_router_svc *svc;
 	int id;
 
-	port = kzalloc_obj(*port, GFP_KERNEL);
+	port = kzalloc_obj(*port);
 	if (!port)
 		return ERR_PTR(-ENOMEM);
 
@@ -416,7 +416,7 @@ static int apr_add_device(struct device *dev, struct device_node *np,
 	struct pkt_router_svc *svc;
 	int ret;
 
-	adev = kzalloc_obj(*adev, GFP_KERNEL);
+	adev = kzalloc_obj(*adev);
 	if (!adev)
 		return -ENOMEM;
 
diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c
index 84ceba84d51a..ad5899d083f3 100644
--- a/drivers/soc/qcom/llcc-qcom.c
+++ b/drivers/soc/qcom/llcc-qcom.c
@@ -4447,7 +4447,7 @@ struct llcc_slice_desc *llcc_slice_getd(u32 uid)
 	if (count == sz || !cfg)
 		return ERR_PTR(-ENODEV);
 
-	desc = kzalloc_obj(*desc, GFP_KERNEL);
+	desc = kzalloc_obj(*desc);
 	if (!desc)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
index 0a6094e17e66..6a23f18b0281 100644
--- a/drivers/soc/qcom/ocmem.c
+++ b/drivers/soc/qcom/ocmem.c
@@ -226,7 +226,7 @@ struct ocmem_buf *ocmem_allocate(struct ocmem *ocmem, enum ocmem_client client,
 	if (test_and_set_bit_lock(BIT(client), &ocmem->active_allocations))
 		return ERR_PTR(-EBUSY);
 
-	struct ocmem_buf *buf __free(kfree) = kzalloc_obj(*buf, GFP_KERNEL);
+	struct ocmem_buf *buf __free(kfree) = kzalloc_obj(*buf);
 	if (!buf) {
 		ret = -ENOMEM;
 		goto err_unlock;
diff --git a/drivers/soc/qcom/pdr_interface.c b/drivers/soc/qcom/pdr_interface.c
index cd36f3f0b80f..ba903569f885 100644
--- a/drivers/soc/qcom/pdr_interface.c
+++ b/drivers/soc/qcom/pdr_interface.c
@@ -322,7 +322,7 @@ static void pdr_indication_cb(struct qmi_handle *qmi,
 		ind_msg->service_path, ind_msg->curr_state,
 		ind_msg->transaction_id);
 
-	ind = kzalloc_obj(*ind, GFP_KERNEL);
+	ind = kzalloc_obj(*ind);
 	if (!ind)
 		return;
 
@@ -520,7 +520,7 @@ struct pdr_service *pdr_add_lookup(struct pdr_handle *pdr,
 	    !service_path || strlen(service_path) > SERVREG_NAME_LENGTH)
 		return ERR_PTR(-EINVAL);
 
-	struct pdr_service *pds __free(kfree) = kzalloc_obj(*pds, GFP_KERNEL);
+	struct pdr_service *pds __free(kfree) = kzalloc_obj(*pds);
 	if (!pds)
 		return ERR_PTR(-ENOMEM);
 
@@ -645,7 +645,7 @@ struct pdr_handle *pdr_handle_alloc(void (*status)(int state,
 	if (!status)
 		return ERR_PTR(-EINVAL);
 
-	struct pdr_handle *pdr __free(kfree) = kzalloc_obj(*pdr, GFP_KERNEL);
+	struct pdr_handle *pdr __free(kfree) = kzalloc_obj(*pdr);
 	if (!pdr)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/soc/qcom/qcom_pd_mapper.c b/drivers/soc/qcom/qcom_pd_mapper.c
index cb92c214311b..dc10bc859ff4 100644
--- a/drivers/soc/qcom/qcom_pd_mapper.c
+++ b/drivers/soc/qcom/qcom_pd_mapper.c
@@ -77,7 +77,7 @@ static int qcom_pdm_add_service_domain(struct qcom_pdm_data *data,
 				return -EBUSY;
 		}
 	} else {
-		service = kzalloc_obj(*service, GFP_KERNEL);
+		service = kzalloc_obj(*service);
 		if (!service)
 			return -ENOMEM;
 
@@ -87,7 +87,7 @@ static int qcom_pdm_add_service_domain(struct qcom_pdm_data *data,
 		list_add_tail(&service->list, &data->services);
 	}
 
-	domain = kzalloc_obj(*domain, GFP_KERNEL);
+	domain = kzalloc_obj(*domain);
 	if (!domain) {
 		if (list_empty(&service->domains)) {
 			list_del(&service->list);
@@ -158,7 +158,7 @@ static void qcom_pdm_get_domain_list(struct qmi_handle *qmi,
 	u32 offset;
 	int ret;
 
-	rsp = kzalloc_obj(*rsp, GFP_KERNEL);
+	rsp = kzalloc_obj(*rsp);
 	if (!rsp)
 		return;
 
@@ -635,7 +635,7 @@ static struct qcom_pdm_data *qcom_pdm_start(void)
 		return ERR_PTR(-ENODEV);
 	}
 
-	data = kzalloc_obj(*data, GFP_KERNEL);
+	data = kzalloc_obj(*data);
 	if (!data)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c
index 59a11fa572a7..16e2e24b6096 100644
--- a/drivers/soc/qcom/qmi_interface.c
+++ b/drivers/soc/qcom/qmi_interface.c
@@ -44,7 +44,7 @@ static void qmi_recv_new_server(struct qmi_handle *qmi,
 	if (!node && !port)
 		return;
 
-	svc = kzalloc_obj(*svc, GFP_KERNEL);
+	svc = kzalloc_obj(*svc);
 	if (!svc)
 		return;
 
@@ -209,7 +209,7 @@ int qmi_add_lookup(struct qmi_handle *qmi, unsigned int service,
 {
 	struct qmi_service *svc;
 
-	svc = kzalloc_obj(*svc, GFP_KERNEL);
+	svc = kzalloc_obj(*svc);
 	if (!svc)
 		return -ENOMEM;
 
@@ -273,7 +273,7 @@ int qmi_add_server(struct qmi_handle *qmi, unsigned int service,
 {
 	struct qmi_service *svc;
 
-	svc = kzalloc_obj(*svc, GFP_KERNEL);
+	svc = kzalloc_obj(*svc);
 	if (!svc)
 		return -ENOMEM;
 
diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c
index cec7912f74dd..342c0845134e 100644
--- a/drivers/soc/qcom/rmtfs_mem.c
+++ b/drivers/soc/qcom/rmtfs_mem.c
@@ -192,7 +192,7 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
 
 	}
 
-	rmtfs_mem = kzalloc_obj(*rmtfs_mem, GFP_KERNEL);
+	rmtfs_mem = kzalloc_obj(*rmtfs_mem);
 	if (!rmtfs_mem)
 		return -ENOMEM;
 
diff --git a/drivers/soc/qcom/smem_state.c b/drivers/soc/qcom/smem_state.c
index 3d9bc96dfd2d..be52ec4396d1 100644
--- a/drivers/soc/qcom/smem_state.c
+++ b/drivers/soc/qcom/smem_state.c
@@ -197,7 +197,7 @@ struct qcom_smem_state *qcom_smem_state_register(struct device_node *of_node,
 {
 	struct qcom_smem_state *state;
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index d170743d576a..38ff0b823bda 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -487,7 +487,7 @@ static int __init renesas_soc_init(void)
 		chipid = ioremap(family->reg, 4);
 	}
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr) {
 		if (chipid)
 			iounmap(chipid);
diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
index 165fad4f548e..291484595dcf 100644
--- a/drivers/soc/tegra/fuse/fuse-tegra.c
+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
@@ -441,7 +441,7 @@ struct device *tegra_soc_device_register(void)
 	struct soc_device_attribute *attr;
 	struct soc_device *dev;
 
-	attr = kzalloc_obj(*attr, GFP_KERNEL);
+	attr = kzalloc_obj(*attr);
 	if (!attr)
 		return NULL;
 
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index 8f2f83c4ad90..a1a2966512d1 100644
--- a/drivers/soc/tegra/pmc.c
+++ b/drivers/soc/tegra/pmc.c
@@ -1131,11 +1131,11 @@ int tegra_pmc_powergate_sequence_power_up(struct tegra_pmc *pmc,
 	if (!tegra_powergate_is_available(pmc, id))
 		return -EINVAL;
 
-	pg = kzalloc_obj(*pg, GFP_KERNEL);
+	pg = kzalloc_obj(*pg);
 	if (!pg)
 		return -ENOMEM;
 
-	pg->clk_rates = kzalloc_obj(*pg->clk_rates, GFP_KERNEL);
+	pg->clk_rates = kzalloc_obj(*pg->clk_rates);
 	if (!pg->clk_rates) {
 		kfree(pg->clks);
 		return -ENOMEM;
@@ -1341,7 +1341,7 @@ static int tegra_powergate_of_get_clks(struct tegra_powergate *pg,
 	if (count == 0)
 		return -ENODEV;
 
-	pg->clks = kzalloc_objs(clk, count, GFP_KERNEL);
+	pg->clks = kzalloc_objs(clk, count);
 	if (!pg->clks)
 		return -ENOMEM;
 
@@ -1402,7 +1402,7 @@ static int tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np)
 	int id, err = 0;
 	bool off;
 
-	pg = kzalloc_obj(*pg, GFP_KERNEL);
+	pg = kzalloc_obj(*pg);
 	if (!pg)
 		return -ENOMEM;
 
diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c
index 8655f829dc7b..676041879eca 100644
--- a/drivers/soc/ti/k3-socinfo.c
+++ b/drivers/soc/ti/k3-socinfo.c
@@ -163,7 +163,7 @@ static int k3_chipinfo_probe(struct platform_device *pdev)
 	partno_id = (jtag_id & CTRLMMR_WKUP_JTAGID_PARTNO_MASK) >>
 		 CTRLMMR_WKUP_JTAGID_PARTNO_SHIFT;
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return -ENOMEM;
 
diff --git a/drivers/soc/ux500/ux500-soc-id.c b/drivers/soc/ux500/ux500-soc-id.c
index eb26a601643a..f49539d79824 100644
--- a/drivers/soc/ux500/ux500-soc-id.c
+++ b/drivers/soc/ux500/ux500-soc-id.c
@@ -205,7 +205,7 @@ static int __init ux500_soc_device_init(void)
 
 	ux500_setup_id();
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr) {
 		of_node_put(backupram);
 		return -ENOMEM;
diff --git a/drivers/soc/versatile/soc-integrator.c b/drivers/soc/versatile/soc-integrator.c
index 45110efcd4a1..b67a7fd4af25 100644
--- a/drivers/soc/versatile/soc-integrator.c
+++ b/drivers/soc/versatile/soc-integrator.c
@@ -123,7 +123,7 @@ static int __init integrator_soc_init(void)
 		return -ENODEV;
 	integrator_coreid = val;
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return -ENOMEM;
 
diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c
index 6a45b1b53caf..f733dc42b3b1 100644
--- a/drivers/soc/xilinx/xlnx_event_manager.c
+++ b/drivers/soc/xilinx/xlnx_event_manager.c
@@ -122,7 +122,7 @@ static int xlnx_add_cb_for_notify_event(const u32 node_id, const u32 event, cons
 
 	if (!present_in_hash) {
 		/* Add new entry if not present in HASH table */
-		eve_data = kmalloc_obj(*eve_data, GFP_KERNEL);
+		eve_data = kmalloc_obj(*eve_data);
 		if (!eve_data)
 			return -ENOMEM;
 		eve_data->key = key;
@@ -130,7 +130,7 @@ static int xlnx_add_cb_for_notify_event(const u32 node_id, const u32 event, cons
 		eve_data->wake = wake;
 		INIT_LIST_HEAD(&eve_data->cb_list_head);
 
-		cb_data = kmalloc_obj(*cb_data, GFP_KERNEL);
+		cb_data = kmalloc_obj(*cb_data);
 		if (!cb_data) {
 			kfree(eve_data);
 			return -ENOMEM;
@@ -153,7 +153,7 @@ static int xlnx_add_cb_for_notify_event(const u32 node_id, const u32 event, cons
 		}
 
 		/* Add multiple handler and private data in list */
-		cb_data = kmalloc_obj(*cb_data, GFP_KERNEL);
+		cb_data = kmalloc_obj(*cb_data);
 		if (!cb_data)
 			return -ENOMEM;
 		cb_data->eve_cb = cb_fun;
@@ -179,7 +179,7 @@ static int xlnx_add_cb_for_suspend(event_cb_func_t cb_fun, void *data)
 	}
 
 	/* Add new entry if not present */
-	eve_data = kmalloc_obj(*eve_data, GFP_KERNEL);
+	eve_data = kmalloc_obj(*eve_data);
 	if (!eve_data)
 		return -ENOMEM;
 
@@ -187,7 +187,7 @@ static int xlnx_add_cb_for_suspend(event_cb_func_t cb_fun, void *data)
 	eve_data->cb_type = PM_INIT_SUSPEND_CB;
 	INIT_LIST_HEAD(&eve_data->cb_list_head);
 
-	cb_data = kmalloc_obj(*cb_data, GFP_KERNEL);
+	cb_data = kmalloc_obj(*cb_data);
 	if (!cb_data) {
 		kfree(eve_data);
 		return -ENOMEM;