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>

9 files changed, 11 insertions, 11 deletions

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 33323c1f8dfe..7283f0f18813 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -329,7 +329,7 @@ static int dummy_systimer_create(struct snd_pcm_substream *substream)
 {
 	struct dummy_systimer_pcm *dpcm;
 
-	dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+	dpcm = kzalloc_obj(*dpcm);
 	if (!dpcm)
 		return -ENOMEM;
 	substream->runtime->private_data = dpcm;
@@ -450,7 +450,7 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream)
 {
 	struct dummy_hrtimer_pcm *dpcm;
 
-	dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+	dpcm = kzalloc_obj(*dpcm);
 	if (!dpcm)
 		return -ENOMEM;
 	substream->runtime->private_data = dpcm;
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 1b573969918f..6de03d72a908 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -518,7 +518,7 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,
 			      out_enable, in_enable, &rmidi);
 	if (err < 0)
 		return err;
-	mpu = kzalloc_obj(*mpu, GFP_KERNEL);
+	mpu = kzalloc_obj(*mpu);
 	if (!mpu) {
 		err = -ENOMEM;
 		goto free_device;
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index eeaa05ad9e5b..36e9eab204ca 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -75,7 +75,7 @@ static int snd_mts64_create(struct snd_card *card,
 
 	*rchip = NULL;
 
-	mts = kzalloc_obj(struct mts64, GFP_KERNEL);
+	mts = kzalloc_obj(struct mts64);
 	if (mts == NULL) 
 		return -ENOMEM;
 
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index ce96b0fd1f43..ea9b258b1e4b 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -324,7 +324,7 @@ int snd_opl3_new(struct snd_card *card,
 	int err;
 
 	*ropl3 = NULL;
-	opl3 = kzalloc_obj(*opl3, GFP_KERNEL);
+	opl3 = kzalloc_obj(*opl3);
 	if (!opl3)
 		return -ENOMEM;
 
diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c
index 7cdd4abb0b7c..47a2486be46d 100644
--- a/sound/drivers/opl3/opl3_synth.c
+++ b/sound/drivers/opl3/opl3_synth.c
@@ -313,7 +313,7 @@ struct fm_patch *snd_opl3_find_patch(struct snd_opl3 *opl3, int prog, int bank,
 	if (!create_patch)
 		return NULL;
 
-	patch = kzalloc_obj(*patch, GFP_KERNEL);
+	patch = kzalloc_obj(*patch);
 	if (!patch)
 		return NULL;
 	patch->prog = prog;
diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
index d476fb7be15e..6364475a368a 100644
--- a/sound/drivers/opl4/opl4_lib.c
+++ b/sound/drivers/opl4/opl4_lib.c
@@ -187,7 +187,7 @@ int snd_opl4_create(struct snd_card *card,
 	if (ropl4)
 		*ropl4 = NULL;
 
-	opl4 = kzalloc_obj(*opl4, GFP_KERNEL);
+	opl4 = kzalloc_obj(*opl4);
 	if (!opl4)
 		return -ENOMEM;
 
diff --git a/sound/drivers/pcmtest.c b/sound/drivers/pcmtest.c
index 8d3a19b628a2..768bb698adfb 100644
--- a/sound/drivers/pcmtest.c
+++ b/sound/drivers/pcmtest.c
@@ -377,7 +377,7 @@ static int snd_pcmtst_pcm_open(struct snd_pcm_substream *substream)
 	if (inject_open_err)
 		return -EBUSY;
 
-	v_iter = kzalloc_obj(*v_iter, GFP_KERNEL);
+	v_iter = kzalloc_obj(*v_iter);
 	if (!v_iter)
 		return -ENOMEM;
 
@@ -575,7 +575,7 @@ static int snd_pcmtst_create(struct snd_card *card, struct platform_device *pdev
 		.dev_free = snd_pcmtst_dev_free,
 	};
 
-	pcmtst = kzalloc_obj(*pcmtst, GFP_KERNEL);
+	pcmtst = kzalloc_obj(*pcmtst);
 	if (!pcmtst)
 		return -ENOMEM;
 	pcmtst->card = card;
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 3dac519c4c45..dcc0899cfb99 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -88,7 +88,7 @@ static int portman_create(struct snd_card *card,
 
 	*rchip = NULL;
 
-	pm = kzalloc_obj(struct portman, GFP_KERNEL);
+	pm = kzalloc_obj(struct portman);
 	if (pm == NULL) 
 		return -ENOMEM;
 
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 0e7a4cdc1390..d337f5990e5c 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -414,7 +414,7 @@ static int vx_alloc_pipe(struct vx_core *chip, int capture,
 		return err;
 
 	/* initialize the pipe record */
-	pipe = kzalloc_obj(*pipe, GFP_KERNEL);
+	pipe = kzalloc_obj(*pipe);
 	if (! pipe) {
 		/* release the pipe */
 		vx_init_rmh(&rmh, CMD_FREE_PIPE);