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>

12 files changed, 37 insertions, 37 deletions

diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c
index 5ec7cfd5e669..31bf097f8aba 100644
--- a/drivers/clk/ti/apll.c
+++ b/drivers/clk/ti/apll.c
@@ -183,9 +183,9 @@ static void __init of_dra7_apll_setup(struct device_node *node)
 	const char **parent_names = NULL;
 	int ret;
 
-	ad = kzalloc_obj(*ad, GFP_KERNEL);
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
-	init = kzalloc_obj(*init, GFP_KERNEL);
+	ad = kzalloc_obj(*ad);
+	clk_hw = kzalloc_obj(*clk_hw);
+	init = kzalloc_obj(*init);
 	if (!ad || !clk_hw || !init)
 		goto cleanup;
 
@@ -347,9 +347,9 @@ static void __init of_omap2_apll_setup(struct device_node *node)
 	u32 val;
 	int ret;
 
-	ad = kzalloc_obj(*ad, GFP_KERNEL);
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
-	init = kzalloc_obj(*init, GFP_KERNEL);
+	ad = kzalloc_obj(*ad);
+	clk_hw = kzalloc_obj(*clk_hw);
+	init = kzalloc_obj(*init);
 
 	if (!ad || !clk_hw || !init)
 		goto cleanup;
diff --git a/drivers/clk/ti/autoidle.c b/drivers/clk/ti/autoidle.c
index 62b136861f95..610f225a8295 100644
--- a/drivers/clk/ti/autoidle.c
+++ b/drivers/clk/ti/autoidle.c
@@ -191,7 +191,7 @@ int __init of_ti_clk_autoidle_setup(struct device_node *node)
 	if (of_property_read_u32(node, "ti,autoidle-shift", &shift))
 		return 0;
 
-	clk = kzalloc_obj(*clk, GFP_KERNEL);
+	clk = kzalloc_obj(*clk);
 
 	if (!clk)
 		return -ENOMEM;
diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c
index fd41aa9fbab1..fb41f55d44e7 100644
--- a/drivers/clk/ti/clk-dra7-atl.c
+++ b/drivers/clk/ti/clk-dra7-atl.c
@@ -170,7 +170,7 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node)
 	const char *name;
 	struct clk *clk;
 
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+	clk_hw = kzalloc_obj(*clk_hw);
 	if (!clk_hw) {
 		pr_err("%s: could not allocate dra7_atl_desc\n", __func__);
 		return;
diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c
index 23ab4f380956..efdb6ab4a5be 100644
--- a/drivers/clk/ti/clk.c
+++ b/drivers/clk/ti/clk.c
@@ -268,7 +268,7 @@ int __init ti_clk_retry_init(struct device_node *node, void *user,
 	struct clk_init_item *retry;
 
 	pr_debug("%pOFn: adding to retry list...\n", node);
-	retry = kzalloc_obj(*retry, GFP_KERNEL);
+	retry = kzalloc_obj(*retry);
 	if (!retry)
 		return -ENOMEM;
 
@@ -411,7 +411,7 @@ int __init omap2_clk_provider_init(struct device_node *parent, int index,
 	/* add clocks node info */
 	clocks_node_ptr[index] = clocks;
 
-	io = kzalloc_obj(*io, GFP_KERNEL);
+	io = kzalloc_obj(*io);
 	if (!io)
 		return -ENOMEM;
 
@@ -576,7 +576,7 @@ int ti_clk_add_alias(struct clk *clk, const char *con)
 	if (IS_ERR(clk))
 		return PTR_ERR(clk);
 
-	cl = kzalloc_obj(*cl, GFP_KERNEL);
+	cl = kzalloc_obj(*cl);
 	if (!cl)
 		return -ENOMEM;
 
diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 06a39d981733..f779906cc8ef 100644
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -297,7 +297,7 @@ _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
 					   ti_clk_get_features()->flags &
 					   TI_CLK_CLKCTRL_COMPAT);
 
-	clkctrl_clk = kzalloc_obj(*clkctrl_clk, GFP_KERNEL);
+	clkctrl_clk = kzalloc_obj(*clkctrl_clk);
 	if (!init.name || !clkctrl_clk) {
 		ret = -ENOMEM;
 		goto cleanup;
@@ -337,7 +337,7 @@ _ti_clkctrl_setup_gate(struct omap_clkctrl_provider *provider,
 {
 	struct clk_hw_omap *clk_hw;
 
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+	clk_hw = kzalloc_obj(*clk_hw);
 	if (!clk_hw)
 		return;
 
@@ -360,7 +360,7 @@ _ti_clkctrl_setup_mux(struct omap_clkctrl_provider *provider,
 	int num_parents = 0;
 	const char * const *pname;
 
-	mux = kzalloc_obj(*mux, GFP_KERNEL);
+	mux = kzalloc_obj(*mux);
 	if (!mux)
 		return;
 
@@ -395,7 +395,7 @@ _ti_clkctrl_setup_div(struct omap_clkctrl_provider *provider,
 	const struct omap_clkctrl_div_data *div_data = data->data;
 	u8 div_flags = 0;
 
-	div = kzalloc_obj(*div, GFP_KERNEL);
+	div = kzalloc_obj(*div);
 	if (!div)
 		return;
 
@@ -579,7 +579,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 		return;
 	}
 
-	provider = kzalloc_obj(*provider, GFP_KERNEL);
+	provider = kzalloc_obj(*provider);
 	if (!provider)
 		return;
 
@@ -650,7 +650,7 @@ clkdm_found:
 			continue;
 		}
 
-		hw = kzalloc_obj(*hw, GFP_KERNEL);
+		hw = kzalloc_obj(*hw);
 		if (!hw)
 			return;
 
@@ -683,7 +683,7 @@ clkdm_found:
 		if (!init.name)
 			goto cleanup;
 
-		clkctrl_clk = kzalloc_obj(*clkctrl_clk, GFP_KERNEL);
+		clkctrl_clk = kzalloc_obj(*clkctrl_clk);
 		if (!clkctrl_clk)
 			goto cleanup;
 
diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
index 0403995cd8ac..c379bbdae25a 100644
--- a/drivers/clk/ti/composite.c
+++ b/drivers/clk/ti/composite.c
@@ -211,7 +211,7 @@ static void __init of_ti_composite_clk_setup(struct device_node *node)
 		return;
 	}
 
-	cclk = kzalloc_obj(*cclk, GFP_KERNEL);
+	cclk = kzalloc_obj(*cclk);
 	if (!cclk)
 		return;
 
@@ -253,7 +253,7 @@ int __init ti_clk_add_component(struct device_node *node, struct clk_hw *hw,
 
 	of_clk_parent_fill(node, parent_names, num_parents);
 
-	clk = kzalloc_obj(*clk, GFP_KERNEL);
+	clk = kzalloc_obj(*clk);
 	if (!clk) {
 		kfree(parent_names);
 		return -ENOMEM;
diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c
index af2776f13413..af923b8cb0ed 100644
--- a/drivers/clk/ti/divider.c
+++ b/drivers/clk/ti/divider.c
@@ -357,7 +357,7 @@ int ti_clk_parse_divider_data(int *div_table, int num_dividers, int max_div,
 
 	num_dividers = i;
 
-	tmp = kzalloc_objs(*tmp, valid_div + 1, GFP_KERNEL);
+	tmp = kzalloc_objs(*tmp, valid_div + 1);
 	if (!tmp)
 		return -ENOMEM;
 
@@ -413,7 +413,7 @@ static int __init ti_clk_get_div_table(struct device_node *node,
 		return -EINVAL;
 	}
 
-	table = kzalloc_objs(*table, valid_div + 1, GFP_KERNEL);
+	table = kzalloc_objs(*table, valid_div + 1);
 	if (!table)
 		return -ENOMEM;
 
@@ -517,7 +517,7 @@ static void __init of_ti_divider_clk_setup(struct device_node *node)
 	u32 flags = 0;
 	struct clk_omap_divider *div;
 
-	div = kzalloc_obj(*div, GFP_KERNEL);
+	div = kzalloc_obj(*div);
 	if (!div)
 		return;
 
@@ -542,7 +542,7 @@ static void __init of_ti_composite_divider_clk_setup(struct device_node *node)
 	struct clk_omap_divider *div;
 	u32 tmp;
 
-	div = kzalloc_obj(*div, GFP_KERNEL);
+	div = kzalloc_obj(*div);
 	if (!div)
 		return;
 
diff --git a/drivers/clk/ti/dpll.c b/drivers/clk/ti/dpll.c
index bce9af95d7aa..e01272cd628d 100644
--- a/drivers/clk/ti/dpll.c
+++ b/drivers/clk/ti/dpll.c
@@ -222,7 +222,7 @@ static void _register_dpll_x2(struct device_node *node,
 		return;
 	}
 
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+	clk_hw = kzalloc_obj(*clk_hw);
 	if (!clk_hw)
 		return;
 
@@ -281,8 +281,8 @@ static void __init of_ti_dpll_setup(struct device_node *node,
 	u32 min_div;
 
 	dd = kmemdup(ddt, sizeof(*dd), GFP_KERNEL);
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
-	init = kzalloc_obj(*init, GFP_KERNEL);
+	clk_hw = kzalloc_obj(*clk_hw);
+	init = kzalloc_obj(*init);
 	if (!dd || !clk_hw || !init)
 		goto cleanup;
 
diff --git a/drivers/clk/ti/fapll.c b/drivers/clk/ti/fapll.c
index 22be4570b038..e54b1df3436e 100644
--- a/drivers/clk/ti/fapll.c
+++ b/drivers/clk/ti/fapll.c
@@ -499,7 +499,7 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
 	struct fapll_synth *synth;
 	struct clk *clk = ERR_PTR(-ENOMEM);
 
-	init = kzalloc_obj(*init, GFP_KERNEL);
+	init = kzalloc_obj(*init);
 	if (!init)
 		return ERR_PTR(-ENOMEM);
 
@@ -508,7 +508,7 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
 	init->parent_names = &parent;
 	init->num_parents = 1;
 
-	synth = kzalloc_obj(*synth, GFP_KERNEL);
+	synth = kzalloc_obj(*synth);
 	if (!synth)
 		goto free;
 
@@ -544,7 +544,7 @@ static void __init ti_fapll_setup(struct device_node *node)
 	const char *name;
 	int i;
 
-	fd = kzalloc_obj(*fd, GFP_KERNEL);
+	fd = kzalloc_obj(*fd);
 	if (!fd)
 		return;
 
@@ -554,7 +554,7 @@ static void __init ti_fapll_setup(struct device_node *node)
 	if (!fd->outputs.clks)
 		goto free;
 
-	init = kzalloc_obj(*init, GFP_KERNEL);
+	init = kzalloc_obj(*init);
 	if (!init)
 		goto free;
 
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index 73986d78492a..74741227013b 100644
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
@@ -95,7 +95,7 @@ static struct clk *_register_gate(struct device_node *node, const char *name,
 	struct clk_hw_omap *clk_hw;
 	struct clk *clk;
 
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+	clk_hw = kzalloc_obj(*clk_hw);
 	if (!clk_hw)
 		return ERR_PTR(-ENOMEM);
 
@@ -169,7 +169,7 @@ _of_ti_composite_gate_clk_setup(struct device_node *node,
 {
 	struct clk_hw_omap *gate;
 
-	gate = kzalloc_obj(*gate, GFP_KERNEL);
+	gate = kzalloc_obj(*gate);
 	if (!gate)
 		return;
 
diff --git a/drivers/clk/ti/interface.c b/drivers/clk/ti/interface.c
index 999e230d7414..039c8075eca4 100644
--- a/drivers/clk/ti/interface.c
+++ b/drivers/clk/ti/interface.c
@@ -34,7 +34,7 @@ static struct clk *_register_interface(struct device_node *node,
 	struct clk_hw_omap *clk_hw;
 	struct clk *clk;
 
-	clk_hw = kzalloc_obj(*clk_hw, GFP_KERNEL);
+	clk_hw = kzalloc_obj(*clk_hw);
 	if (!clk_hw)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c
index 3911e43a6716..d6a0ccfd81db 100644
--- a/drivers/clk/ti/mux.c
+++ b/drivers/clk/ti/mux.c
@@ -129,7 +129,7 @@ static struct clk *_register_mux(struct device_node *node, const char *name,
 	struct clk_init_data init;
 
 	/* allocate the mux */
-	mux = kzalloc_obj(*mux, GFP_KERNEL);
+	mux = kzalloc_obj(*mux);
 	if (!mux)
 		return ERR_PTR(-ENOMEM);
 
@@ -227,7 +227,7 @@ struct clk_hw *ti_clk_build_component_mux(struct ti_clk_mux *setup)
 	if (!setup)
 		return NULL;
 
-	mux = kzalloc_obj(*mux, GFP_KERNEL);
+	mux = kzalloc_obj(*mux);
 	if (!mux)
 		return ERR_PTR(-ENOMEM);
 
@@ -253,7 +253,7 @@ static void __init of_ti_composite_mux_clk_setup(struct device_node *node)
 	struct clk_omap_mux *mux;
 	unsigned int num_parents;
 
-	mux = kzalloc_obj(*mux, GFP_KERNEL);
+	mux = kzalloc_obj(*mux);
 	if (!mux)
 		return;