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>

52 files changed, 123 insertions, 123 deletions

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 7392bc15affa..0bb65be021d9 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1957,7 +1957,7 @@ int snd_ac97_bus(struct snd_card *card, int num,
 
 	if (snd_BUG_ON(!card))
 		return -EINVAL;
-	bus = kzalloc_obj(*bus, GFP_KERNEL);
+	bus = kzalloc_obj(*bus);
 	if (bus == NULL)
 		return -ENOMEM;
 	bus->card = card;
@@ -2069,7 +2069,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
 		return -EBUSY;
 
 	card = bus->card;
-	ac97 = kzalloc_obj(*ac97, GFP_KERNEL);
+	ac97 = kzalloc_obj(*ac97);
 	if (ac97 == NULL)
 		return -ENOMEM;
 	ac97->private_data = template->private_data;
diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c
index 9df21c42d624..cbfbabb02818 100644
--- a/sound/pci/ac97/ac97_pcm.c
+++ b/sound/pci/ac97/ac97_pcm.c
@@ -441,7 +441,7 @@ int snd_ac97_pcm_assign(struct snd_ac97_bus *bus,
 	unsigned int rates;
 	struct snd_ac97 *codec;
 
-	rpcms = kzalloc_objs(struct ac97_pcm, pcms_count, GFP_KERNEL);
+	rpcms = kzalloc_objs(struct ac97_pcm, pcms_count);
 	if (rpcms == NULL)
 		return -ENOMEM;
 	memset(avail_slots, 0, sizeof(avail_slots));
diff --git a/sound/pci/ak4531_codec.c b/sound/pci/ak4531_codec.c
index c7f32b1de462..6f35b616efc6 100644
--- a/sound/pci/ak4531_codec.c
+++ b/sound/pci/ak4531_codec.c
@@ -373,7 +373,7 @@ int snd_ak4531_mixer(struct snd_card *card,
 		return -EINVAL;
 	if (rak4531)
 		*rak4531 = NULL;
-	ak4531 = kzalloc_obj(*ak4531, GFP_KERNEL);
+	ak4531 = kzalloc_obj(*ak4531);
 	if (ak4531 == NULL)
 		return -ENOMEM;
 	*ak4531 = *_ak4531;
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 5b82777522d8..a73893a2cbd6 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -342,7 +342,7 @@ static int snd_als300_playback_open(struct snd_pcm_substream *substream)
 {
 	struct snd_als300 *chip = snd_pcm_substream_chip(substream);
 	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_als300_substream_data *data = kzalloc_obj(*data, GFP_KERNEL);
+	struct snd_als300_substream_data *data = kzalloc_obj(*data);
 
 	if (!data)
 		return -ENOMEM;
@@ -369,7 +369,7 @@ static int snd_als300_capture_open(struct snd_pcm_substream *substream)
 {
 	struct snd_als300 *chip = snd_pcm_substream_chip(substream);
 	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_als300_substream_data *data = kzalloc_obj(*data, GFP_KERNEL);
+	struct snd_als300_substream_data *data = kzalloc_obj(*data);
 
 	if (!data)
 		return -ENOMEM;
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index c5f38fc88c86..3a64d0562803 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -975,7 +975,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
 	struct snd_pcm_hardware snd_card_asihpi_playback;
 	int err;
 
-	dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+	dpcm = kzalloc_obj(*dpcm);
 	if (dpcm == NULL)
 		return -ENOMEM;
 
@@ -1145,7 +1145,7 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
 	struct snd_pcm_hardware snd_card_asihpi_capture;
 	int err;
 
-	dpcm = kzalloc_obj(*dpcm, GFP_KERNEL);
+	dpcm = kzalloc_obj(*dpcm);
 	if (dpcm == NULL)
 		return -ENOMEM;
 
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 41b2892a9312..c8d1518ee3e7 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -406,7 +406,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
 
 	memset(&ao, 0, sizeof(ao));
 
-	ao.priv = kzalloc_obj(struct hpi_hw_obj, GFP_KERNEL);
+	ao.priv = kzalloc_obj(struct hpi_hw_obj);
 	if (!ao.priv) {
 		HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
 		phr->error = HPI_ERROR_MEMORY_ALLOC;
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index c484d929d6da..98e7f7fa75c3 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -461,7 +461,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
 
 	memset(&ao, 0, sizeof(ao));
 
-	ao.priv = kzalloc_obj(struct hpi_hw_obj, GFP_KERNEL);
+	ao.priv = kzalloc_obj(struct hpi_hw_obj);
 	if (!ao.priv) {
 		HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
 		phr->error = HPI_ERROR_MEMORY_ALLOC;
diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index 2378bdeb1f23..d846777e7462 100644
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -641,12 +641,12 @@ void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *p_cache,
 struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,
 	const u32 size_in_bytes, u8 *p_dsp_control_buffer)
 {
-	struct hpi_control_cache *p_cache = kmalloc_obj(*p_cache, GFP_KERNEL);
+	struct hpi_control_cache *p_cache = kmalloc_obj(*p_cache);
 	if (!p_cache)
 		return NULL;
 
 	p_cache->p_info =
-		kzalloc_objs(*p_cache->p_info, control_count, GFP_KERNEL);
+		kzalloc_objs(*p_cache->p_info, control_count);
 	if (!p_cache->p_info) {
 		kfree(p_cache);
 		return NULL;
diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c
index 8eda87107b28..b1b5a131f626 100644
--- a/sound/pci/asihpi/hpidspcd.c
+++ b/sound/pci/asihpi/hpidspcd.c
@@ -69,7 +69,7 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code,
 	}
 
 	HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name);
-	dsp_code->pvt = kmalloc_obj(*dsp_code->pvt, GFP_KERNEL);
+	dsp_code->pvt = kmalloc_obj(*dsp_code->pvt);
 	if (!dsp_code->pvt) {
 		err_ret = HPI_ERROR_MEMORY_ALLOC;
 		goto error2;
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 24c116ab9cf5..9de9ae7032b8 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -105,8 +105,8 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	if (cmd != HPI_IOCTL_LINUX)
 		return -EINVAL;
 
-	hm = kmalloc_obj(*hm, GFP_KERNEL);
-	hr = kzalloc_obj(*hr, GFP_KERNEL);
+	hm = kmalloc_obj(*hm);
+	hr = kzalloc_obj(*hr);
 	if (!hm || !hr) {
 		err = -ENOMEM;
 		goto out;
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index bdf9453939f3..35392f6525b3 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -543,7 +543,7 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	int err;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 
 	if (epcm == NULL)
 		return -ENOMEM;
@@ -638,7 +638,7 @@ static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substre
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	int err;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (!epcm)
 		return -ENOMEM;
 
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 189948f70d84..cd73b6833639 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -1096,7 +1096,7 @@ static int save_mixer_state(struct cmipci *cm)
 		struct snd_ctl_elem_value *val;
 		unsigned int i;
 
-		val = kmalloc_obj(*val, GFP_KERNEL);
+		val = kmalloc_obj(*val);
 		if (!val)
 			return -ENOMEM;
 		for (i = 0; i < CM_SAVED_MIXERS; i++) {
@@ -1130,7 +1130,7 @@ static void restore_mixer_state(struct cmipci *cm)
 		struct snd_ctl_elem_value *val;
 		unsigned int i;
 
-		val = kmalloc_obj(*val, GFP_KERNEL);
+		val = kmalloc_obj(*val);
 		if (!val)
 			return;
 		cm->mixer_insensitive = 0; /* at first clear this;
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index d7bed722d939..1c11023184ac 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -401,7 +401,7 @@ static int load_firmware(struct snd_cs46xx *chip,
 	}
 
 	err = -ENOMEM;
-	module = kzalloc_obj(*module, GFP_KERNEL);
+	module = kzalloc_obj(*module);
 	if (!module)
 		goto error;
 	module->module_name = kstrdup(fw_name, GFP_KERNEL);
@@ -414,7 +414,7 @@ static int load_firmware(struct snd_cs46xx *chip,
 	if (nums >= 40)
 		goto error_inval;
 	module->symbol_table.symbols =
-		kzalloc_objs(struct dsp_symbol_entry, nums, GFP_KERNEL);
+		kzalloc_objs(struct dsp_symbol_entry, nums);
 	if (!module->symbol_table.symbols)
 		goto error;
 	for (i = 0; i < nums; i++) {
@@ -434,7 +434,7 @@ static int load_firmware(struct snd_cs46xx *chip,
 	if (nums > 10)
 		goto error_inval;
 	module->segments =
-		kzalloc_objs(struct dsp_segment_desc, nums, GFP_KERNEL);
+		kzalloc_objs(struct dsp_segment_desc, nums);
 	if (!module->segments)
 		goto error;
 	for (i = 0; i < nums; i++) {
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index c55ff043d1d7..fd19365026b4 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -234,7 +234,7 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,
 		entry = snd_info_create_card_entry(ins->snd_card, scb->scb_name,
 						   ins->proc_dsp_dir);
 		if (entry) {
-			scb_info = kmalloc_obj(struct proc_scb_info, GFP_KERNEL);
+			scb_info = kmalloc_obj(struct proc_scb_info);
 			if (!scb_info) {
 				snd_info_free_entry(entry);
 				entry = NULL;
diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c
index c22e3173ec1b..5fc1c922620a 100644
--- a/sound/pci/ctxfi/ctamixer.c
+++ b/sound/pci/ctxfi/ctamixer.c
@@ -296,7 +296,7 @@ int amixer_mgr_create(struct hw *hw, void **ramixer_mgr)
 	struct amixer_mgr *amixer_mgr;
 
 	*ramixer_mgr = NULL;
-	amixer_mgr = kzalloc_obj(*amixer_mgr, GFP_KERNEL);
+	amixer_mgr = kzalloc_obj(*amixer_mgr);
 	if (!amixer_mgr)
 		return -ENOMEM;
 
@@ -448,7 +448,7 @@ int sum_mgr_create(struct hw *hw, void **rsum_mgr)
 	struct sum_mgr *sum_mgr;
 
 	*rsum_mgr = NULL;
-	sum_mgr = kzalloc_obj(*sum_mgr, GFP_KERNEL);
+	sum_mgr = kzalloc_obj(*sum_mgr);
 	if (!sum_mgr)
 		return -ENOMEM;
 
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index f130a2722a70..f122e396bc55 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1723,7 +1723,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci,
 
 	*ratc = NULL;
 
-	atc = kzalloc_obj(*atc, GFP_KERNEL);
+	atc = kzalloc_obj(*atc);
 	if (!atc)
 		return -ENOMEM;
 
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index 12653f7cd9e8..b8bde27f3a1d 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -159,7 +159,7 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input)
 	struct daio *daio = &dao->daio;
 	int i;
 
-	entry = kzalloc_objs(*entry, daio->rscl.msr, GFP_KERNEL);
+	entry = kzalloc_objs(*entry, daio->rscl.msr);
 	if (!entry)
 		return -ENOMEM;
 
@@ -188,7 +188,7 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)
 	struct daio *daio = &dao->daio;
 	int i;
 
-	entry = kzalloc_objs(*entry, daio->rscr.msr, GFP_KERNEL);
+	entry = kzalloc_objs(*entry, daio->rscr.msr);
 	if (!entry)
 		return -ENOMEM;
 
@@ -660,7 +660,7 @@ int daio_mgr_create(struct hw *hw, void **rdaio_mgr)
 	struct imapper *entry;
 
 	*rdaio_mgr = NULL;
-	daio_mgr = kzalloc_obj(*daio_mgr, GFP_KERNEL);
+	daio_mgr = kzalloc_obj(*daio_mgr);
 	if (!daio_mgr)
 		return -ENOMEM;
 
@@ -671,7 +671,7 @@ int daio_mgr_create(struct hw *hw, void **rdaio_mgr)
 	spin_lock_init(&daio_mgr->mgr_lock);
 	spin_lock_init(&daio_mgr->imap_lock);
 	INIT_LIST_HEAD(&daio_mgr->imappers);
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry) {
 		err = -ENOMEM;
 		goto error2;
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 0851453b8565..06753f555944 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -157,7 +157,7 @@ static int src_get_rsc_ctrl_blk(void **rblk)
 	struct src_rsc_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -483,7 +483,7 @@ static int src_mgr_get_ctrl_blk(void **rblk)
 	struct src_mgr_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -504,7 +504,7 @@ static int srcimp_mgr_get_ctrl_blk(void **rblk)
 	struct srcimp_mgr_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -691,7 +691,7 @@ static int amixer_rsc_get_ctrl_blk(void **rblk)
 	struct amixer_rsc_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -898,7 +898,7 @@ static int dai_get_ctrl_blk(void **rblk)
 	struct dai_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -947,7 +947,7 @@ static int dao_get_ctrl_blk(void **rblk)
 	struct dao_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -1141,7 +1141,7 @@ static int daio_mgr_get_ctrl_blk(struct hw *hw, void **rblk)
 	struct daio_mgr_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -2227,7 +2227,7 @@ int create_20k1_hw_obj(struct hw **rhw)
 	struct hw20k1 *hw20k1;
 
 	*rhw = NULL;
-	hw20k1 = kzalloc_obj(*hw20k1, GFP_KERNEL);
+	hw20k1 = kzalloc_obj(*hw20k1);
 	if (!hw20k1)
 		return -ENOMEM;
 
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index 1d558914a26a..07e1490a6d17 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -157,7 +157,7 @@ static int src_get_rsc_ctrl_blk(void **rblk)
 	struct src_rsc_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -483,7 +483,7 @@ static int src_mgr_get_ctrl_blk(void **rblk)
 	struct src_mgr_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -504,7 +504,7 @@ static int srcimp_mgr_get_ctrl_blk(void **rblk)
 	struct srcimp_mgr_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -693,7 +693,7 @@ static int amixer_rsc_get_ctrl_blk(void **rblk)
 	struct amixer_rsc_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -882,7 +882,7 @@ static int dai_get_ctrl_blk(void **rblk)
 	struct dai_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -932,7 +932,7 @@ static int dao_get_ctrl_blk(void **rblk)
 	struct dao_ctrl_blk *blk;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -1084,7 +1084,7 @@ static int daio_mgr_get_ctrl_blk(struct hw *hw, void **rblk)
 	int i;
 
 	*rblk = NULL;
-	blk = kzalloc_obj(*blk, GFP_KERNEL);
+	blk = kzalloc_obj(*blk);
 	if (!blk)
 		return -ENOMEM;
 
@@ -2369,7 +2369,7 @@ int create_20k2_hw_obj(struct hw **rhw)
 	struct hw20k2 *hw20k2;
 
 	*rhw = NULL;
-	hw20k2 = kzalloc_obj(*hw20k2, GFP_KERNEL);
+	hw20k2 = kzalloc_obj(*hw20k2);
 	if (!hw20k2)
 		return -ENOMEM;
 
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c
index 3c5b89f3eae3..e3ee76bd8482 100644
--- a/sound/pci/ctxfi/ctmixer.c
+++ b/sound/pci/ctxfi/ctmixer.c
@@ -969,7 +969,7 @@ static int ct_mixer_get_mem(struct ct_mixer **rmixer)
 
 	*rmixer = NULL;
 	/* Allocate mem for mixer obj */
-	mixer = kzalloc_obj(*mixer, GFP_KERNEL);
+	mixer = kzalloc_obj(*mixer);
 	if (!mixer)
 		return -ENOMEM;
 
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index 2b0f4130642c..fea6024f920e 100644
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -119,7 +119,7 @@ static int ct_pcm_playback_open(struct snd_pcm_substream *substream)
 	struct ct_atc_pcm *apcm;
 	int err;
 
-	apcm = kzalloc_obj(*apcm, GFP_KERNEL);
+	apcm = kzalloc_obj(*apcm);
 	if (!apcm)
 		return -ENOMEM;
 
@@ -265,7 +265,7 @@ static int ct_pcm_capture_open(struct snd_pcm_substream *substream)
 	struct ct_atc_pcm *apcm;
 	int err;
 
-	apcm = kzalloc_obj(*apcm, GFP_KERNEL);
+	apcm = kzalloc_obj(*apcm);
 	if (!apcm)
 		return -ENOMEM;
 
diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index b781201c7f0e..326997bb885d 100644
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -540,7 +540,7 @@ int src_mgr_create(struct hw *hw, void **rsrc_mgr)
 	struct src_mgr *src_mgr;
 
 	*rsrc_mgr = NULL;
-	src_mgr = kzalloc_obj(*src_mgr, GFP_KERNEL);
+	src_mgr = kzalloc_obj(*src_mgr);
 	if (!src_mgr)
 		return -ENOMEM;
 
@@ -669,7 +669,7 @@ static int srcimp_rsc_init(struct srcimp *srcimp,
 		return err;
 
 	/* Reserve memory for imapper nodes */
-	srcimp->imappers = kzalloc_objs(struct imapper, desc->msr, GFP_KERNEL);
+	srcimp->imappers = kzalloc_objs(struct imapper, desc->msr);
 	if (!srcimp->imappers) {
 		err = -ENOMEM;
 		goto error1;
@@ -810,7 +810,7 @@ int srcimp_mgr_create(struct hw *hw, void **rsrcimp_mgr)
 	struct imapper *entry;
 
 	*rsrcimp_mgr = NULL;
-	srcimp_mgr = kzalloc_obj(*srcimp_mgr, GFP_KERNEL);
+	srcimp_mgr = kzalloc_obj(*srcimp_mgr);
 	if (!srcimp_mgr)
 		return -ENOMEM;
 
@@ -821,7 +821,7 @@ int srcimp_mgr_create(struct hw *hw, void **rsrcimp_mgr)
 	spin_lock_init(&srcimp_mgr->mgr_lock);
 	spin_lock_init(&srcimp_mgr->imap_lock);
 	INIT_LIST_HEAD(&srcimp_mgr->imappers);
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry) {
 		err = -ENOMEM;
 		goto error2;
diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c
index 53d16f575c38..cc379d880cad 100644
--- a/sound/pci/ctxfi/cttimer.c
+++ b/sound/pci/ctxfi/cttimer.c
@@ -390,7 +390,7 @@ struct ct_timer *ct_timer_new(struct ct_atc *atc)
 	struct ct_timer *atimer;
 	struct hw *hw;
 
-	atimer = kzalloc_obj(*atimer, GFP_KERNEL);
+	atimer = kzalloc_obj(*atimer);
 	if (!atimer)
 		return NULL;
 	spin_lock_init(&atimer->lock);
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c
index 316072863dbf..25e071cae08b 100644
--- a/sound/pci/ctxfi/ctvmem.c
+++ b/sound/pci/ctxfi/ctvmem.c
@@ -55,7 +55,7 @@ get_vm_block(struct ct_vm *vm, unsigned int size, struct ct_atc *atc)
 		return entry;
 	}
 
-	block = kzalloc_obj(*block, GFP_KERNEL);
+	block = kzalloc_obj(*block);
 	if (!block)
 		return NULL;
 
@@ -170,7 +170,7 @@ int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)
 
 	*rvm = NULL;
 
-	vm = kzalloc_obj(*vm, GFP_KERNEL);
+	vm = kzalloc_obj(*vm);
 	if (!vm)
 		return -ENOMEM;
 
@@ -195,7 +195,7 @@ int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)
 	vm->get_ptp_phys = ct_get_ptp_phys;
 	INIT_LIST_HEAD(&vm->unused);
 	INIT_LIST_HEAD(&vm->used);
-	block = kzalloc_obj(*block, GFP_KERNEL);
+	block = kzalloc_obj(*block);
 	if (NULL != block) {
 		block->addr = 0;
 		block->size = vm->size;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index fdf309633c8a..214d68657707 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -265,7 +265,7 @@ static int pcm_open(struct snd_pcm_substream *substream,
 	chip = snd_pcm_substream_chip(substream);
 	runtime = substream->runtime;
 
-	pipe = kzalloc_obj(struct audiopipe, GFP_KERNEL);
+	pipe = kzalloc_obj(struct audiopipe);
 	if (!pipe)
 		return -ENOMEM;
 	pipe->index = -1;		/* Not configured yet */
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index e79f773941cd..1b207ca25814 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -367,7 +367,7 @@ static int snd_emu10k1x_playback_open(struct snd_pcm_substream *substream)
 	if (err < 0)
                 return err;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (epcm == NULL)
 		return -ENOMEM;
 	epcm->emu = chip;
@@ -547,7 +547,7 @@ static int snd_emu10k1x_pcm_open_capture(struct snd_pcm_substream *substream)
 	if (err < 0)
 		return err;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (epcm == NULL)
 		return -ENOMEM;
 
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index a9c786fe638a..080c5fedc850 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -776,7 +776,7 @@ static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu,
 		if (snd_emu10k1_look_for_ctl(emu, &id) == NULL)
 			return -ENOENT;
 	}
-	gctl = kmalloc_obj(*gctl, GFP_KERNEL);
+	gctl = kmalloc_obj(*gctl);
 	if (! gctl)
 		return -ENOMEM;
 	err = 0;
@@ -864,9 +864,9 @@ static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,
 	struct snd_ctl_elem_value *val;
 	int err = 0;
 
-	val = kmalloc_obj(*val, GFP_KERNEL);
-	gctl = kmalloc_obj(*gctl, GFP_KERNEL);
-	nctl = kmalloc_obj(*nctl, GFP_KERNEL);
+	val = kmalloc_obj(*val);
+	gctl = kmalloc_obj(*gctl);
+	nctl = kmalloc_obj(*nctl);
 	if (!val || !gctl || !nctl) {
 		err = -ENOMEM;
 		goto __error;
@@ -914,7 +914,7 @@ static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,
 		nctl->max = gctl->max;
 		nctl->translation = gctl->translation;
 		if (ctl == NULL) {
-			ctl = kmalloc_obj(*ctl, GFP_KERNEL);
+			ctl = kmalloc_obj(*ctl);
 			if (ctl == NULL) {
 				err = -ENOMEM;
 				kfree(knew.tlv.p);
@@ -980,7 +980,7 @@ static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu,
 	struct snd_emu10k1_fx8010_ctl *ctl;
 	struct snd_ctl_elem_id *id;
 
-	gctl = kmalloc_obj(*gctl, GFP_KERNEL);
+	gctl = kmalloc_obj(*gctl);
 	if (! gctl)
 		return -ENOMEM;
 
@@ -1282,7 +1282,7 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
 	u32 *gpr_map;
 
 	err = -ENOMEM;
-	icode = kzalloc_obj(*icode, GFP_KERNEL);
+	icode = kzalloc_obj(*icode);
 	if (!icode)
 		return err;
 
@@ -1290,7 +1290,7 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
 				      GFP_KERNEL);
 	if (!icode->gpr_map)
 		goto __err_gpr;
-	controls = kzalloc_objs(*controls, SND_EMU10K1_GPR_CONTROLS, GFP_KERNEL);
+	controls = kzalloc_objs(*controls, SND_EMU10K1_GPR_CONTROLS);
 	if (!controls)
 		goto __err_ctrls;
 
@@ -1799,7 +1799,7 @@ static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
 	u32 *gpr_map;
 
 	err = -ENOMEM;
-	icode = kzalloc_obj(*icode, GFP_KERNEL);
+	icode = kzalloc_obj(*icode);
 	if (!icode)
 		return err;
 
@@ -1813,7 +1813,7 @@ static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
 	if (!controls)
 		goto __err_ctrls;
 
-	ipcm = kzalloc_obj(*ipcm, GFP_KERNEL);
+	ipcm = kzalloc_obj(*ipcm);
 	if (!ipcm)
 		goto __err_ipcm;
 
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 1a0fd2014691..9023f3444d20 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1132,7 +1132,7 @@ static int snd_emu10k1_efx_playback_open(struct snd_pcm_substream *substream)
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	int i, j, err;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (epcm == NULL)
 		return -ENOMEM;
 	epcm->emu = emu;
@@ -1171,7 +1171,7 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream)
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	int i, err, sample_rate;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (epcm == NULL)
 		return -ENOMEM;
 	epcm->emu = emu;
@@ -1222,7 +1222,7 @@ static int snd_emu10k1_capture_open(struct snd_pcm_substream *substream)
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct snd_emu10k1_pcm *epcm;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (epcm == NULL)
 		return -ENOMEM;
 	epcm->emu = emu;
@@ -1259,7 +1259,7 @@ static int snd_emu10k1_capture_mic_open(struct snd_pcm_substream *substream)
 	struct snd_emu10k1_pcm *epcm;
 	struct snd_pcm_runtime *runtime = substream->runtime;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (epcm == NULL)
 		return -ENOMEM;
 	epcm->emu = emu;
@@ -1299,7 +1299,7 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream)
 	int nefx = emu->audigy ? 64 : 32;
 	int idx, err;
 
-	epcm = kzalloc_obj(*epcm, GFP_KERNEL);
+	epcm = kzalloc_obj(*epcm);
 	if (epcm == NULL)
 		return -ENOMEM;
 	epcm->emu = emu;
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 6650f0192281..b7282b3fa1b1 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1307,7 +1307,7 @@ static struct esm_memory *snd_es1968_new_memory(struct es1968 *chip, int size)
 
 __found:
 	if (buf->buf.bytes > size) {
-		struct esm_memory *chunk = kmalloc_obj(*chunk, GFP_KERNEL);
+		struct esm_memory *chunk = kmalloc_obj(*chunk);
 		if (chunk == NULL)
 			return NULL;
 		chunk->buf = buf->buf;
@@ -1385,7 +1385,7 @@ snd_es1968_init_dmabuf(struct es1968 *chip)
 
 	INIT_LIST_HEAD(&chip->buf_list);
 	/* allocate an empty chunk */
-	chunk = kmalloc_obj(*chunk, GFP_KERNEL);
+	chunk = kmalloc_obj(*chunk);
 	if (chunk == NULL) {
 		snd_es1968_free_dmabuf(chip);
 		return -ENOMEM;
@@ -1488,7 +1488,7 @@ static int snd_es1968_playback_open(struct snd_pcm_substream *substream)
 	if (apu1 < 0)
 		return apu1;
 
-	es = kzalloc_obj(*es, GFP_KERNEL);
+	es = kzalloc_obj(*es);
 	if (!es) {
 		snd_es1968_free_apu_pair(chip, apu1);
 		return -ENOMEM;
@@ -1529,7 +1529,7 @@ static int snd_es1968_capture_open(struct snd_pcm_substream *substream)
 		return apu2;
 	}
 	
-	es = kzalloc_obj(*es, GFP_KERNEL);
+	es = kzalloc_obj(*es);
 	if (!es) {
 		snd_es1968_free_apu_pair(chip, apu1);
 		snd_es1968_free_apu_pair(chip, apu2);
diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c
index e82bfc02599e..bcafa16ce547 100644
--- a/sound/pci/ice1712/ak4xxx.c
+++ b/sound/pci/ice1712/ak4xxx.c
@@ -115,7 +115,7 @@ int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak, const struct snd_akm4xxx *t
 	struct snd_ak4xxx_private *priv;
 
 	if (_priv != NULL) {
-		priv = kmalloc_obj(*priv, GFP_KERNEL);
+		priv = kmalloc_obj(*priv);
 		if (priv == NULL)
 			return -ENOMEM;
 		*priv = *_priv;
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 92c4950137b0..1191a2686dfd 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -2076,7 +2076,7 @@ static int aureon_init(struct snd_ice1712 *ice)
 	struct aureon_spec *spec;
 	int i, err;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
@@ -2091,7 +2091,7 @@ static int aureon_init(struct snd_ice1712 *ice)
 	}
 
 	/* to remember the register values of CS8415 */
-	ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ice->akm = kzalloc_obj(struct snd_akm4xxx);
 	if (!ice->akm)
 		return -ENOMEM;
 	ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index 5ea80bd596e6..897b749c70b5 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -707,7 +707,7 @@ static int snd_ice1712_delta_init(struct snd_ice1712 *ice)
 	}
 
 	/* second stage of initialization, analog parts and others */
-	ak = ice->akm = kmalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ak = ice->akm = kmalloc_obj(struct snd_akm4xxx);
 	if (! ak)
 		return -ENOMEM;
 	ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index 43a0a569de1b..26f5d5528e27 100644
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -431,7 +431,7 @@ static int snd_ice1712_ews_init(struct snd_ice1712 *ice)
 		break;
 	}
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
@@ -530,7 +530,7 @@ static int snd_ice1712_ews_init(struct snd_ice1712 *ice)
 	}
 
 	/* analog section */
-	ak = ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ak = ice->akm = kzalloc_obj(struct snd_akm4xxx);
 	if (! ak)
 		return -ENOMEM;
 	ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c
index ab651526aba9..5294c9dd782d 100644
--- a/sound/pci/ice1712/hoontech.c
+++ b/sound/pci/ice1712/hoontech.c
@@ -156,7 +156,7 @@ static int hoontech_init(struct snd_ice1712 *ice, bool staudio)
 	ice->num_total_dacs = 8;
 	ice->num_total_adcs = 8;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
@@ -301,7 +301,7 @@ static int snd_ice1712_value_init(struct snd_ice1712 *ice)
 	ice->num_total_adcs = 2;
 	
 	/* analog section */
-	ak = ice->akm = kmalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ak = ice->akm = kmalloc_obj(struct snd_akm4xxx);
 	if (! ak)
 		return -ENOMEM;
 	ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index 10f0eb7b347d..ab1c8ac07160 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -560,7 +560,7 @@ static int juli_init(struct snd_ice1712 *ice)
 	struct juli_spec *spec;
 	struct snd_akm4xxx *ak;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
@@ -594,7 +594,7 @@ static int juli_init(struct snd_ice1712 *ice)
 		ice->num_total_dacs = 2;
 		ice->num_total_adcs = 2;
 
-		ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+		ice->akm = kzalloc_obj(struct snd_akm4xxx);
 		ak = ice->akm;
 		if (!ak)
 			return -ENOMEM;
diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c
index b854fec347c4..fd1427d64a7b 100644
--- a/sound/pci/ice1712/maya44.c
+++ b/sound/pci/ice1712/maya44.c
@@ -668,7 +668,7 @@ static int maya44_init(struct snd_ice1712 *ice)
 	int i;
 	struct snd_maya44 *chip;
 
-	chip = kzalloc_obj(*chip, GFP_KERNEL);
+	chip = kzalloc_obj(*chip);
 	if (!chip)
 		return -ENOMEM;
 	mutex_init(&chip->mutex);
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c
index 00f97b87b06c..37756d06218d 100644
--- a/sound/pci/ice1712/phase.c
+++ b/sound/pci/ice1712/phase.c
@@ -125,7 +125,7 @@ static int phase22_init(struct snd_ice1712 *ice)
 	}
 
 	/* Initialize analog chips */
-	ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ice->akm = kzalloc_obj(struct snd_akm4xxx);
 	ak = ice->akm;
 	if (!ak)
 		return -ENOMEM;
@@ -411,13 +411,13 @@ static int phase28_init(struct snd_ice1712 *ice)
 	ice->num_total_dacs = 8;
 	ice->num_total_adcs = 2;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
 
 	/* Initialize analog chips */
-	ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ice->akm = kzalloc_obj(struct snd_akm4xxx);
 	ak = ice->akm;
 	if (!ak)
 		return -ENOMEM;
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index 80f7bb3af420..b2bd64ece862 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -728,7 +728,7 @@ static int pontis_init(struct snd_ice1712 *ice)
 	ice->num_total_adcs = 2;
 
 	/* to remember the register values */
-	ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ice->akm = kzalloc_obj(struct snd_akm4xxx);
 	if (! ice->akm)
 		return -ENOMEM;
 	ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c
index 039ead80dd64..6c4783b9a983 100644
--- a/sound/pci/ice1712/prodigy192.c
+++ b/sound/pci/ice1712/prodigy192.c
@@ -713,7 +713,7 @@ static int prodigy192_init(struct snd_ice1712 *ice)
 	ice->num_total_adcs = 2;
 	ice->vt1720 = 0;  /* ice1724, e.g. 23 GPIOs */
 	
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
index 105409daf071..bb5169a69b18 100644
--- a/sound/pci/ice1712/prodigy_hifi.c
+++ b/sound/pci/ice1712/prodigy_hifi.c
@@ -1060,12 +1060,12 @@ static int prodigy_hifi_init(struct snd_ice1712 *ice)
 	ice->gpio.saved[0] = 0;
 	/* to remember the register values */
 
-	ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ice->akm = kzalloc_obj(struct snd_akm4xxx);
 	if (! ice->akm)
 		return -ENOMEM;
 	ice->akm_codecs = 1;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
@@ -1143,12 +1143,12 @@ static int prodigy_hd2_init(struct snd_ice1712 *ice)
 	ice->gpio.saved[0] = 0;
 	/* to remember the register values */
 
-	ice->akm = kzalloc_obj(struct snd_akm4xxx, GFP_KERNEL);
+	ice->akm = kzalloc_obj(struct snd_akm4xxx);
 	if (! ice->akm)
 		return -ENOMEM;
 	ice->akm_codecs = 1;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
diff --git a/sound/pci/ice1712/psc724.c b/sound/pci/ice1712/psc724.c
index bb69d5173983..7842bf98af19 100644
--- a/sound/pci/ice1712/psc724.c
+++ b/sound/pci/ice1712/psc724.c
@@ -383,7 +383,7 @@ static int psc724_init(struct snd_ice1712 *ice)
 {
 	struct psc724_spec *spec;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
diff --git a/sound/pci/ice1712/quartet.c b/sound/pci/ice1712/quartet.c
index a4f13a3ed6cf..6a44ae969d15 100644
--- a/sound/pci/ice1712/quartet.c
+++ b/sound/pci/ice1712/quartet.c
@@ -969,7 +969,7 @@ static int qtet_init(struct snd_ice1712 *ice)
 	val = inb(ICEMT1724(ice, RATE));
 	outb(val | VT1724_SPDIF_MASTER, ICEMT1724(ice, RATE));
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	/* qtet is clocked by Xilinx array */
@@ -1005,7 +1005,7 @@ static int qtet_init(struct snd_ice1712 *ice)
 	ice->num_total_dacs = 2;
 	ice->num_total_adcs = 2;
 
-	ice->akm = kzalloc_objs(struct snd_akm4xxx, 2, GFP_KERNEL);
+	ice->akm = kzalloc_objs(struct snd_akm4xxx, 2);
 	ak = ice->akm;
 	if (!ak)
 		return -ENOMEM;
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 37556ff6fb36..d9723c297d40 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -147,7 +147,7 @@ static int revo51_i2c_init(struct snd_ice1712 *ice,
 	struct revo51_spec *spec;
 	int err;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
@@ -470,7 +470,7 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice)
 	int err;
 
 	struct revo51_spec *spec;
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
@@ -515,7 +515,7 @@ static int revo_init(struct snd_ice1712 *ice)
 	}
 
 	/* second stage of initialization, analog parts and others */
-	ak = ice->akm = kzalloc_objs(struct snd_akm4xxx, 2, GFP_KERNEL);
+	ak = ice->akm = kzalloc_objs(struct snd_akm4xxx, 2);
 	if (! ak)
 		return -ENOMEM;
 	switch (ice->eeprom.subvendor) {
diff --git a/sound/pci/ice1712/se.c b/sound/pci/ice1712/se.c
index 09f5085d2dde..d78328288fc6 100644
--- a/sound/pci/ice1712/se.c
+++ b/sound/pci/ice1712/se.c
@@ -660,7 +660,7 @@ static int se_init(struct snd_ice1712 *ice)
 {
 	struct se_spec *spec;
 
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
diff --git a/sound/pci/ice1712/wtm.c b/sound/pci/ice1712/wtm.c
index 0c961b588cd2..c38f1bd1948d 100644
--- a/sound/pci/ice1712/wtm.c
+++ b/sound/pci/ice1712/wtm.c
@@ -579,7 +579,7 @@ static int wtm_init(struct snd_ice1712 *ice)
 	ice->force_rdma1 = 1;
 
 	/*init mutex for dac mute conflict*/
-	spec = kzalloc_obj(*spec, GFP_KERNEL);
+	spec = kzalloc_obj(*spec);
 	if (!spec)
 		return -ENOMEM;
 	ice->spec = spec;
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index bcf36b102f6f..a7760a23bfe9 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -255,7 +255,7 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,
 			"add_ref_pipe audio chip(%d) pcm(%d)\n",
 			chip->chip_idx, pcm_number);
 
-		buf = kmalloc_obj(*buf, GFP_KERNEL);
+		buf = kmalloc_obj(*buf);
 		if (!buf)
 			return NULL;
 
@@ -1017,7 +1017,7 @@ static int snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int
 		.dev_free = snd_mixart_chip_dev_free,
 	};
 
-	chip = kzalloc_obj(*chip, GFP_KERNEL);
+	chip = kzalloc_obj(*chip);
 	if (!chip)
 		return -ENOMEM;
 
@@ -1243,7 +1243,7 @@ static int snd_mixart_probe(struct pci_dev *pci,
 
 	/*
 	 */
-	mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+	mgr = kzalloc_obj(*mgr);
 	if (! mgr) {
 		pci_disable_device(pci);
 		return -ENOMEM;
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 9b19c83a26c5..439e3ff05fe1 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -135,9 +135,9 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
 	struct mixart_audio_info_req  *audio_info_req;
 	struct mixart_audio_info_resp *audio_info;
 
-	connector = kmalloc_obj(*connector, GFP_KERNEL);
-	audio_info_req = kmalloc_obj(*audio_info_req, GFP_KERNEL);
-	audio_info = kmalloc_obj(*audio_info, GFP_KERNEL);
+	connector = kmalloc_obj(*connector);
+	audio_info_req = kmalloc_obj(*audio_info_req);
+	audio_info = kmalloc_obj(*audio_info);
 	if (! connector || ! audio_info_req || ! audio_info) {
 		err = -ENOMEM;
 		goto __error;
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 66e71bdfbc77..e7d63972c2ca 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1163,7 +1163,7 @@ static int pcxhr_create(struct pcxhr_mgr *mgr,
 		.dev_free = pcxhr_chip_dev_free,
 	};
 
-	chip = kzalloc_obj(*chip, GFP_KERNEL);
+	chip = kzalloc_obj(*chip);
 	if (!chip)
 		return -ENOMEM;
 
@@ -1488,7 +1488,7 @@ static int pcxhr_probe(struct pci_dev *pci,
 	}
 
 	/* alloc card manager */
-	mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+	mgr = kzalloc_obj(*mgr);
 	if (! mgr) {
 		pci_disable_device(pci);
 		return -ENOMEM;
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 8217a42c5bb7..99c00e46ce23 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1595,7 +1595,7 @@ static int snd_riptide_playback_open(struct snd_pcm_substream *substream)
 	chip->playback_substream[sub_num] = substream;
 	runtime->hw = snd_riptide_playback;
 
-	data = kzalloc_obj(struct pcmhw, GFP_KERNEL);
+	data = kzalloc_obj(struct pcmhw);
 	if (data == NULL)
 		return -ENOMEM;
 	data->paths = lbus_play_paths[sub_num];
@@ -1618,7 +1618,7 @@ static int snd_riptide_capture_open(struct snd_pcm_substream *substream)
 	chip->capture_substream = substream;
 	runtime->hw = snd_riptide_capture;
 
-	data = kzalloc_obj(struct pcmhw, GFP_KERNEL);
+	data = kzalloc_obj(struct pcmhw);
 	if (data == NULL)
 		return -ENOMEM;
 	data->paths = lbus_rec_path;
@@ -1768,7 +1768,7 @@ static int snd_riptide_initialize(struct snd_riptide *chip)
 
 	cif = chip->cif;
 	if (!cif) {
-		cif = kzalloc_obj(struct cmdif, GFP_KERNEL);
+		cif = kzalloc_obj(struct cmdif);
 		if (!cif)
 			return -ENOMEM;
 		cif->dev = chip->card->dev;
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 2978036aa8c5..d8bbedbc8ff6 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -6671,7 +6671,7 @@ static int snd_hdspm_create(struct snd_card *card,
 		if (hdspm_read(hdspm, HDSPM_statusRegister2) &
 				HDSPM_s2_tco_detect) {
 			hdspm->midiPorts++;
-			hdspm->tco = kzalloc_obj(*hdspm->tco, GFP_KERNEL);
+			hdspm->tco = kzalloc_obj(*hdspm->tco);
 			if (hdspm->tco)
 				hdspm_tco_write(hdspm);
 
@@ -6685,7 +6685,7 @@ static int snd_hdspm_create(struct snd_card *card,
 	case AES32:
 		if (hdspm_read(hdspm, HDSPM_statusRegister) & HDSPM_tco_detect) {
 			hdspm->midiPorts++;
-			hdspm->tco = kzalloc_obj(*hdspm->tco, GFP_KERNEL);
+			hdspm->tco = kzalloc_obj(*hdspm->tco);
 			if (hdspm->tco)
 				hdspm_tco_write(hdspm);
 
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index b0f1433e530f..fa8d7f271eaf 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -2888,7 +2888,7 @@ static int snd_trident_mixer(struct snd_trident *trident, int pcm_spdif_device)
 		.read = snd_trident_codec_read,
 	};
 
-	uctl = kzalloc_obj(*uctl, GFP_KERNEL);
+	uctl = kzalloc_obj(*uctl);
 	if (!uctl)
 		return -ENOMEM;
 
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index dc6f603160ac..b9a09568afc9 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -864,7 +864,7 @@ static int snd_ymfpci_playback_open_1(struct snd_pcm_substream *substream)
 	if (err < 0)
 		return err;
 
-	ypcm = kzalloc_obj(*ypcm, GFP_KERNEL);
+	ypcm = kzalloc_obj(*ypcm);
 	if (ypcm == NULL)
 		return -ENOMEM;
 	ypcm->chip = chip;
@@ -990,7 +990,7 @@ static int snd_ymfpci_capture_open(struct snd_pcm_substream *substream,
 	if (err < 0)
 		return err;
 
-	ypcm = kzalloc_obj(*ypcm, GFP_KERNEL);
+	ypcm = kzalloc_obj(*ypcm);
 	if (ypcm == NULL)
 		return -ENOMEM;
 	ypcm->chip = chip;