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>

18 files changed, 33 insertions, 33 deletions

diff --git a/drivers/clk/at91/clk-audio-pll.c b/drivers/clk/at91/clk-audio-pll.c
index 9133c0ec7f08..732037bfbda8 100644
--- a/drivers/clk/at91/clk-audio-pll.c
+++ b/drivers/clk/at91/clk-audio-pll.c
@@ -460,7 +460,7 @@ at91_clk_register_audio_pll_frac(struct regmap *regmap, const char *name,
 	struct clk_init_data init = {};
 	int ret;
 
-	frac_ck = kzalloc_obj(*frac_ck, GFP_KERNEL);
+	frac_ck = kzalloc_obj(*frac_ck);
 	if (!frac_ck)
 		return ERR_PTR(-ENOMEM);
 
@@ -490,7 +490,7 @@ at91_clk_register_audio_pll_pad(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	apad_ck = kzalloc_obj(*apad_ck, GFP_KERNEL);
+	apad_ck = kzalloc_obj(*apad_ck);
 	if (!apad_ck)
 		return ERR_PTR(-ENOMEM);
 
@@ -521,7 +521,7 @@ at91_clk_register_audio_pll_pmc(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	apmc_ck = kzalloc_obj(*apmc_ck, GFP_KERNEL);
+	apmc_ck = kzalloc_obj(*apmc_ck);
 	if (!apmc_ck)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index 0427f112829b..5d3a62433187 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -332,7 +332,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
 	if (!(parent_names || parent_hws))
 		return ERR_PTR(-ENOMEM);
 
-	gck = kzalloc_obj(*gck, GFP_KERNEL);
+	gck = kzalloc_obj(*gck);
 	if (!gck)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c
index a56e65eb2333..12bd112d3c50 100644
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
@@ -100,7 +100,7 @@ at91_clk_register_h32mx(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	h32mxclk = kzalloc_obj(*h32mxclk, GFP_KERNEL);
+	h32mxclk = kzalloc_obj(*h32mxclk);
 	if (!h32mxclk)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-i2s-mux.c b/drivers/clk/at91/clk-i2s-mux.c
index 309a8d6136d5..a762c56dcadd 100644
--- a/drivers/clk/at91/clk-i2s-mux.c
+++ b/drivers/clk/at91/clk-i2s-mux.c
@@ -57,7 +57,7 @@ at91_clk_i2s_mux_register(struct regmap *regmap, const char *name,
 	struct clk_i2s_mux *i2s_ck;
 	int ret;
 
-	i2s_ck = kzalloc_obj(*i2s_ck, GFP_KERNEL);
+	i2s_ck = kzalloc_obj(*i2s_ck);
 	if (!i2s_ck)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index 51b0421d01e3..ab515239adcf 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -163,7 +163,7 @@ at91_clk_register_main_osc(struct regmap *regmap,
 	if (!name || !(parent_name || parent_data))
 		return ERR_PTR(-EINVAL);
 
-	osc = kzalloc_obj(*osc, GFP_KERNEL);
+	osc = kzalloc_obj(*osc);
 	if (!osc)
 		return ERR_PTR(-ENOMEM);
 
@@ -306,7 +306,7 @@ at91_clk_register_main_rc_osc(struct regmap *regmap,
 	if (!name || !frequency)
 		return ERR_PTR(-EINVAL);
 
-	osc = kzalloc_obj(*osc, GFP_KERNEL);
+	osc = kzalloc_obj(*osc);
 	if (!osc)
 		return ERR_PTR(-ENOMEM);
 
@@ -415,7 +415,7 @@ at91_clk_register_rm9200_main(struct regmap *regmap,
 	if (!(parent_name || parent_hw))
 		return ERR_PTR(-EINVAL);
 
-	clkmain = kzalloc_obj(*clkmain, GFP_KERNEL);
+	clkmain = kzalloc_obj(*clkmain);
 	if (!clkmain)
 		return ERR_PTR(-ENOMEM);
 
@@ -567,7 +567,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap,
 	if (!(parent_hws || parent_names) || !num_parents)
 		return ERR_PTR(-EINVAL);
 
-	clkmain = kzalloc_obj(*clkmain, GFP_KERNEL);
+	clkmain = kzalloc_obj(*clkmain);
 	if (!clkmain)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index 5e4f5fcc0645..05001e7700ca 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -488,7 +488,7 @@ at91_clk_register_master_internal(struct regmap *regmap,
 	if (!name || !num_parents || !(parent_names || parent_hws) || !lock)
 		return ERR_PTR(-EINVAL);
 
-	master = kzalloc_obj(*master, GFP_KERNEL);
+	master = kzalloc_obj(*master);
 	if (!master)
 		return ERR_PTR(-ENOMEM);
 
@@ -831,7 +831,7 @@ at91_clk_sama7g5_register_master(struct regmap *regmap,
 	    !lock || id > MASTER_MAX_ID)
 		return ERR_PTR(-EINVAL);
 
-	master = kzalloc_obj(*master, GFP_KERNEL);
+	master = kzalloc_obj(*master);
 	if (!master)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-peripheral.c b/drivers/clk/at91/clk-peripheral.c
index dda4217aaf85..4946ea0cdbba 100644
--- a/drivers/clk/at91/clk-peripheral.c
+++ b/drivers/clk/at91/clk-peripheral.c
@@ -109,7 +109,7 @@ at91_clk_register_peripheral(struct regmap *regmap, const char *name,
 	if (!name || !(parent_name || parent_hw) || id > PERIPHERAL_ID_MAX)
 		return ERR_PTR(-EINVAL);
 
-	periph = kzalloc_obj(*periph, GFP_KERNEL);
+	periph = kzalloc_obj(*periph);
 	if (!periph)
 		return ERR_PTR(-ENOMEM);
 
@@ -471,7 +471,7 @@ at91_clk_register_sam9x5_peripheral(struct regmap *regmap, spinlock_t *lock,
 	if (!name || !(parent_name || parent_hw))
 		return ERR_PTR(-EINVAL);
 
-	periph = kzalloc_obj(*periph, GFP_KERNEL);
+	periph = kzalloc_obj(*periph);
 	if (!periph)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-pll.c b/drivers/clk/at91/clk-pll.c
index 083e7524ff8f..b89f60cf0241 100644
--- a/drivers/clk/at91/clk-pll.c
+++ b/drivers/clk/at91/clk-pll.c
@@ -326,7 +326,7 @@ at91_clk_register_pll(struct regmap *regmap, const char *name,
 	if (id > PLL_MAX_ID)
 		return ERR_PTR(-EINVAL);
 
-	pll = kzalloc_obj(*pll, GFP_KERNEL);
+	pll = kzalloc_obj(*pll);
 	if (!pll)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-plldiv.c b/drivers/clk/at91/clk-plldiv.c
index 27feb5207b40..5f93aead03fa 100644
--- a/drivers/clk/at91/clk-plldiv.c
+++ b/drivers/clk/at91/clk-plldiv.c
@@ -91,7 +91,7 @@ at91_clk_register_plldiv(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	plldiv = kzalloc_obj(*plldiv, GFP_KERNEL);
+	plldiv = kzalloc_obj(*plldiv);
 	if (!plldiv)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index a87e63f4c3f8..bfd8b03b035c 100644
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -227,7 +227,7 @@ at91_clk_register_programmable(struct regmap *regmap,
 	if (id > PROG_ID_MAX || !(parent_names || parent_hws))
 		return ERR_PTR(-EINVAL);
 
-	prog = kzalloc_obj(*prog, GFP_KERNEL);
+	prog = kzalloc_obj(*prog);
 	if (!prog)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-sam9x60-pll.c b/drivers/clk/at91/clk-sam9x60-pll.c
index 5f5cecbcf207..9d9b5adecf0d 100644
--- a/drivers/clk/at91/clk-sam9x60-pll.c
+++ b/drivers/clk/at91/clk-sam9x60-pll.c
@@ -652,7 +652,7 @@ sam9x60_clk_register_frac_pll(struct regmap *regmap, spinlock_t *lock,
 	if (id > PLL_MAX_ID || !lock || !parent_hw)
 		return ERR_PTR(-EINVAL);
 
-	frac = kzalloc_obj(*frac, GFP_KERNEL);
+	frac = kzalloc_obj(*frac);
 	if (!frac)
 		return ERR_PTR(-ENOMEM);
 
@@ -744,7 +744,7 @@ sam9x60_clk_register_div_pll(struct regmap *regmap, spinlock_t *lock,
 	if (safe_div >= PLL_DIV_MAX)
 		safe_div = PLL_DIV_MAX - 1;
 
-	div = kzalloc_obj(*div, GFP_KERNEL);
+	div = kzalloc_obj(*div);
 	if (!div)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c
index e39db89e2a37..f0cad50e490b 100644
--- a/drivers/clk/at91/clk-slow.c
+++ b/drivers/clk/at91/clk-slow.c
@@ -52,7 +52,7 @@ at91_clk_register_sam9260_slow(struct regmap *regmap,
 	if (!parent_names || !num_parents)
 		return ERR_PTR(-EINVAL);
 
-	slowck = kzalloc_obj(*slowck, GFP_KERNEL);
+	slowck = kzalloc_obj(*slowck);
 	if (!slowck)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c
index 3c07dcd3cc2c..77f2b8fe6cab 100644
--- a/drivers/clk/at91/clk-smd.c
+++ b/drivers/clk/at91/clk-smd.c
@@ -118,7 +118,7 @@ at91sam9x5_clk_register_smd(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	smd = kzalloc_obj(*smd, GFP_KERNEL);
+	smd = kzalloc_obj(*smd);
 	if (!smd)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index c3de1dabf283..93e1e8cebce8 100644
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -116,7 +116,7 @@ at91_clk_register_system(struct regmap *regmap, const char *name,
 	if (!(parent_name || parent_hw) || id > SYSTEM_MAX_ID)
 		return ERR_PTR(-EINVAL);
 
-	sys = kzalloc_obj(*sys, GFP_KERNEL);
+	sys = kzalloc_obj(*sys);
 	if (!sys)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index e5107d0cf383..b4dc86193e09 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -229,7 +229,7 @@ _at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	usb = kzalloc_obj(*usb, GFP_KERNEL);
+	usb = kzalloc_obj(*usb);
 	if (!usb)
 		return ERR_PTR(-ENOMEM);
 
@@ -280,7 +280,7 @@ at91sam9n12_clk_register_usb(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	usb = kzalloc_obj(*usb, GFP_KERNEL);
+	usb = kzalloc_obj(*usb);
 	if (!usb)
 		return ERR_PTR(-ENOMEM);
 
@@ -399,7 +399,7 @@ at91rm9200_clk_register_usb(struct regmap *regmap, const char *name,
 	struct clk_init_data init;
 	int ret;
 
-	usb = kzalloc_obj(*usb, GFP_KERNEL);
+	usb = kzalloc_obj(*usb);
 	if (!usb)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c
index f318c11bbc44..40b335b0195c 100644
--- a/drivers/clk/at91/clk-utmi.c
+++ b/drivers/clk/at91/clk-utmi.c
@@ -155,7 +155,7 @@ at91_clk_register_utmi_internal(struct regmap *regmap_pmc,
 	if (!(parent_name || parent_hw))
 		return ERR_PTR(-EINVAL);
 
-	utmi = kzalloc_obj(*utmi, GFP_KERNEL);
+	utmi = kzalloc_obj(*utmi);
 	if (!utmi)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
index dddcfcf453a1..5d543e807843 100644
--- a/drivers/clk/at91/dt-compat.c
+++ b/drivers/clk/at91/dt-compat.c
@@ -369,7 +369,7 @@ of_at91_clk_master_get_characteristics(struct device_node *np)
 {
 	struct clk_master_characteristics *characteristics;
 
-	characteristics = kzalloc_obj(*characteristics, GFP_KERNEL);
+	characteristics = kzalloc_obj(*characteristics);
 	if (!characteristics)
 		return NULL;
 
@@ -568,11 +568,11 @@ of_at91_clk_pll_get_characteristics(struct device_node *np)
 		return NULL;
 	num_output /= num_cells;
 
-	characteristics = kzalloc_obj(*characteristics, GFP_KERNEL);
+	characteristics = kzalloc_obj(*characteristics);
 	if (!characteristics)
 		return NULL;
 
-	output = kzalloc_objs(*output, num_output, GFP_KERNEL);
+	output = kzalloc_objs(*output, num_output);
 	if (!output)
 		goto out_free_characteristics;
 
diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c
index 8ce851dc3e3f..61fcb3d1ee40 100644
--- a/drivers/clk/at91/sckc.c
+++ b/drivers/clk/at91/sckc.c
@@ -132,7 +132,7 @@ at91_clk_register_slow_osc(void __iomem *sckcr,
 	if (!sckcr || !name || !parent_data)
 		return ERR_PTR(-EINVAL);
 
-	osc = kzalloc_obj(*osc, GFP_KERNEL);
+	osc = kzalloc_obj(*osc);
 	if (!osc)
 		return ERR_PTR(-ENOMEM);
 
@@ -239,7 +239,7 @@ at91_clk_register_slow_rc_osc(void __iomem *sckcr,
 	if (!sckcr || !name)
 		return ERR_PTR(-EINVAL);
 
-	osc = kzalloc_obj(*osc, GFP_KERNEL);
+	osc = kzalloc_obj(*osc);
 	if (!osc)
 		return ERR_PTR(-ENOMEM);
 
@@ -332,7 +332,7 @@ at91_clk_register_sam9x5_slow(void __iomem *sckcr,
 	if (!sckcr || !name || !parent_hws || !num_parents)
 		return ERR_PTR(-EINVAL);
 
-	slowck = kzalloc_obj(*slowck, GFP_KERNEL);
+	slowck = kzalloc_obj(*slowck);
 	if (!slowck)
 		return ERR_PTR(-ENOMEM);
 
@@ -611,7 +611,7 @@ static void __init of_sama5d4_sckc_setup(struct device_node *np)
 		goto unregister_slow_rc;
 	parent_data.fw_name = xtal_name;
 
-	osc = kzalloc_obj(*osc, GFP_KERNEL);
+	osc = kzalloc_obj(*osc);
 	if (!osc)
 		goto unregister_slow_rc;