summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/aoa/codecs/onyx.c6
-rw-r--r--sound/core/oss/pcm_plugin.c3
-rw-r--r--sound/core/seq/seq_memory.c3
-rw-r--r--sound/core/ump.c3
-rw-r--r--sound/drivers/vx/vx_pcm.c6
-rw-r--r--sound/hda/codecs/ca0132.c3
-rw-r--r--sound/hda/common/proc.c3
-rw-r--r--sound/hda/core/ext/stream.c3
-rw-r--r--sound/hda/core/sysfs.c3
-rw-r--r--sound/pci/cs46xx/dsp_spos.c6
-rw-r--r--sound/pci/emu10k1/emufx.c6
-rw-r--r--sound/pci/via82xx.c3
-rw-r--r--sound/pci/via82xx_modem.c3
-rw-r--r--sound/soc/au1x/dma.c3
-rw-r--r--sound/soc/codecs/aw88395/aw88395_lib.c3
-rw-r--r--sound/soc/codecs/da7219.c3
-rw-r--r--sound/soc/codecs/lpass-rx-macro.c6
-rw-r--r--sound/soc/codecs/lpass-wsa-macro.c6
-rw-r--r--sound/soc/codecs/tas2781-fmwlib.c12
-rw-r--r--sound/soc/codecs/wm_adsp.c3
-rw-r--r--sound/soc/soc-dapm.c3
-rw-r--r--sound/soc/sof/ipc3-topology.c3
-rw-r--r--sound/soc/sof/ipc4-topology.c3
-rw-r--r--sound/synth/emux/emux.c3
-rw-r--r--sound/synth/emux/emux_seq.c3
-rw-r--r--sound/usb/6fire/control.c3
-rw-r--r--sound/usb/line6/capture.c3
-rw-r--r--sound/usb/line6/playback.c3
-rw-r--r--sound/usb/mixer.c3
-rw-r--r--sound/usb/mixer_quirks.c3
-rw-r--r--sound/usb/usx2y/usbusx2yaudio.c3
-rw-r--r--sound/xen/xen_snd_front_alsa.c3
32 files changed, 41 insertions, 82 deletions
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
index 3ae8408cd303..04961c456d2c 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -855,8 +855,7 @@ static int onyx_init_codec(struct aoa_codec *codec)
/* if no inputs are present... */
if ((onyx->codec.connected & 0xC) == 0) {
if (!onyx->codec_info)
- onyx->codec_info = kmalloc_obj(struct codec_info,
- GFP_KERNEL);
+ onyx->codec_info = kmalloc_obj(struct codec_info);
if (!onyx->codec_info)
return -ENOMEM;
ci = onyx->codec_info;
@@ -867,8 +866,7 @@ static int onyx_init_codec(struct aoa_codec *codec)
/* if no outputs are present... */
if ((onyx->codec.connected & 3) == 0) {
if (!onyx->codec_info)
- onyx->codec_info = kmalloc_obj(struct codec_info,
- GFP_KERNEL);
+ onyx->codec_info = kmalloc_obj(struct codec_info);
if (!onyx->codec_info)
return -ENOMEM;
ci = onyx->codec_info;
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index e5a0e3c79f7e..14b4a390a219 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -163,8 +163,7 @@ int snd_pcm_plugin_build(struct snd_pcm_substream *plug,
channels = src_format->channels;
else
channels = dst_format->channels;
- plugin->buf_channels = kzalloc_objs(*plugin->buf_channels, channels,
- GFP_KERNEL);
+ plugin->buf_channels = kzalloc_objs(*plugin->buf_channels, channels);
if (plugin->buf_channels == NULL) {
snd_pcm_plugin_free(plugin);
return -ENOMEM;
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 48b0aa0c3395..aaf808316c30 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -441,8 +441,7 @@ int snd_seq_pool_init(struct snd_seq_pool *pool)
if (snd_BUG_ON(!pool))
return -EINVAL;
- cellptr = kvmalloc_objs(struct snd_seq_event_cell, pool->size,
- GFP_KERNEL);
+ cellptr = kvmalloc_objs(struct snd_seq_event_cell, pool->size);
if (!cellptr)
return -ENOMEM;
diff --git a/sound/core/ump.c b/sound/core/ump.c
index 114ebf8c3a51..70520c7ca293 100644
--- a/sound/core/ump.c
+++ b/sound/core/ump.c
@@ -1352,8 +1352,7 @@ int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,
bool input, output;
int err, num;
- ump->out_cvts = kzalloc_objs(*ump->out_cvts, SNDRV_UMP_MAX_GROUPS,
- GFP_KERNEL);
+ ump->out_cvts = kzalloc_objs(*ump->out_cvts, SNDRV_UMP_MAX_GROUPS);
if (!ump->out_cvts)
return -ENOMEM;
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index d337f5990e5c..d9b94580704a 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -1154,12 +1154,10 @@ static int vx_init_audio_io(struct vx_core *chip)
chip->audio_info = rmh.Stat[1];
/* allocate pipes */
- chip->playback_pipes = kzalloc_objs(struct vx_pipe *, chip->audio_outs,
- GFP_KERNEL);
+ chip->playback_pipes = kzalloc_objs(struct vx_pipe *, chip->audio_outs);
if (!chip->playback_pipes)
return -ENOMEM;
- chip->capture_pipes = kzalloc_objs(struct vx_pipe *, chip->audio_ins,
- GFP_KERNEL);
+ chip->capture_pipes = kzalloc_objs(struct vx_pipe *, chip->audio_ins);
if (!chip->capture_pipes) {
kfree(chip->playback_pipes);
return -ENOMEM;
diff --git a/sound/hda/codecs/ca0132.c b/sound/hda/codecs/ca0132.c
index e4f174d0ebb1..bf342a76807c 100644
--- a/sound/hda/codecs/ca0132.c
+++ b/sound/hda/codecs/ca0132.c
@@ -9831,8 +9831,7 @@ static int ca0132_prepare_verbs(struct hda_codec *codec)
*/
if (ca0132_use_pci_mmio(spec))
spec->desktop_init_verbs = ca0132_init_verbs1;
- spec->spec_init_verbs = kzalloc_objs(struct hda_verb, NUM_SPEC_VERBS,
- GFP_KERNEL);
+ spec->spec_init_verbs = kzalloc_objs(struct hda_verb, NUM_SPEC_VERBS);
if (!spec->spec_init_verbs)
return -ENOMEM;
diff --git a/sound/hda/common/proc.c b/sound/hda/common/proc.c
index ce76b8190b9f..3bc33c5617b2 100644
--- a/sound/hda/common/proc.c
+++ b/sound/hda/common/proc.c
@@ -845,8 +845,7 @@ static void print_codec_info(struct snd_info_entry *entry,
if (wid_caps & AC_WCAP_CONN_LIST) {
conn_len = snd_hda_get_num_raw_conns(codec, nid);
if (conn_len > 0) {
- conn = kmalloc_objs(hda_nid_t, conn_len,
- GFP_KERNEL);
+ conn = kmalloc_objs(hda_nid_t, conn_len);
if (!conn)
return;
if (snd_hda_get_raw_connections(codec, nid, conn,
diff --git a/sound/hda/core/ext/stream.c b/sound/hda/core/ext/stream.c
index a213e5b06bdb..4c7506d49f55 100644
--- a/sound/hda/core/ext/stream.c
+++ b/sound/hda/core/ext/stream.c
@@ -101,8 +101,7 @@ int snd_hdac_ext_stream_init_all(struct hdac_bus *bus, int start_idx,
setup_op = snd_hdac_stream_setup;
for (i = 0; i < num_stream; i++) {
- struct hdac_ext_stream *hext_stream = kzalloc_obj(*hext_stream,
- GFP_KERNEL);
+ struct hdac_ext_stream *hext_stream = kzalloc_obj(*hext_stream);
if (!hext_stream)
return -ENOMEM;
tag = ++stream_tag;
diff --git a/sound/hda/core/sysfs.c b/sound/hda/core/sysfs.c
index 09d88f22957a..3e102538e058 100644
--- a/sound/hda/core/sysfs.c
+++ b/sound/hda/core/sysfs.c
@@ -374,8 +374,7 @@ static int widget_tree_create(struct hdac_device *codec)
if (!tree->root)
return -ENOMEM;
- tree->nodes = kzalloc_objs(*tree->nodes, codec->num_nodes + 1,
- GFP_KERNEL);
+ tree->nodes = kzalloc_objs(*tree->nodes, codec->num_nodes + 1);
if (!tree->nodes)
return -ENOMEM;
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index f106f46aeb87..6fd4f629d1d5 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -221,8 +221,7 @@ add_symbol (struct snd_cs46xx * chip, char * symbol_name, u32 address, int type)
struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
{
- struct dsp_spos_instance * ins = kzalloc_obj(struct dsp_spos_instance,
- GFP_KERNEL);
+ struct dsp_spos_instance * ins = kzalloc_obj(struct dsp_spos_instance);
if (ins == NULL)
return NULL;
@@ -232,8 +231,7 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
vmalloc(array_size(DSP_MAX_SYMBOLS,
sizeof(struct dsp_symbol_entry)));
ins->code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL);
- ins->modules = kmalloc_objs(struct dsp_module_desc, DSP_MAX_MODULES,
- GFP_KERNEL);
+ ins->modules = kmalloc_objs(struct dsp_module_desc, DSP_MAX_MODULES);
if (!ins->symbol_table.symbols || !ins->code.data || !ins->modules) {
cs46xx_dsp_spos_destroy(chip);
goto error;
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 080c5fedc850..77845b709e12 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -1286,8 +1286,7 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
if (!icode)
return err;
- icode->gpr_map = kzalloc_objs(u_int32_t, 512 + 256 + 256 + 2 * 1024,
- GFP_KERNEL);
+ icode->gpr_map = kzalloc_objs(u_int32_t, 512 + 256 + 256 + 2 * 1024);
if (!icode->gpr_map)
goto __err_gpr;
controls = kzalloc_objs(*controls, SND_EMU10K1_GPR_CONTROLS);
@@ -1803,8 +1802,7 @@ static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
if (!icode)
return err;
- icode->gpr_map = kzalloc_objs(u_int32_t, 256 + 160 + 160 + 2 * 512,
- GFP_KERNEL);
+ icode->gpr_map = kzalloc_objs(u_int32_t, 256 + 160 + 160 + 2 * 512);
if (!icode->gpr_map)
goto __err_gpr;
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 0290bf6b089d..41b322fbd9ef 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -423,8 +423,7 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
return -ENOMEM;
}
if (! dev->idx_table) {
- dev->idx_table = kmalloc_objs(*dev->idx_table, VIA_TABLE_SIZE,
- GFP_KERNEL);
+ dev->idx_table = kmalloc_objs(*dev->idx_table, VIA_TABLE_SIZE);
if (! dev->idx_table)
return -ENOMEM;
}
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 94430e87791d..a6f176d612e3 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -278,8 +278,7 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
return -ENOMEM;
}
if (! dev->idx_table) {
- dev->idx_table = kmalloc_objs(*dev->idx_table, VIA_TABLE_SIZE,
- GFP_KERNEL);
+ dev->idx_table = kmalloc_objs(*dev->idx_table, VIA_TABLE_SIZE);
if (! dev->idx_table)
return -ENOMEM;
}
diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c
index bf5f2185c526..8d91a0e0f112 100644
--- a/sound/soc/au1x/dma.c
+++ b/sound/soc/au1x/dma.c
@@ -89,8 +89,7 @@ static int au1000_setup_dma_link(struct audio_stream *stream,
pointer->start = (u32)(dma_start + (i * period_bytes));
pointer->relative_end = (u32) (((i+1) * period_bytes) - 0x1);
if (i < periods - 1) {
- pointer->next = kmalloc_obj(struct pcm_period,
- GFP_KERNEL);
+ pointer->next = kmalloc_obj(struct pcm_period);
if (!pointer->next) {
au1000_release_dma_link(stream);
return -ENOMEM;
diff --git a/sound/soc/codecs/aw88395/aw88395_lib.c b/sound/soc/codecs/aw88395/aw88395_lib.c
index 31799ca5bb0f..056adbcd1ce8 100644
--- a/sound/soc/codecs/aw88395/aw88395_lib.c
+++ b/sound/soc/codecs/aw88395/aw88395_lib.c
@@ -665,8 +665,7 @@ static int aw_dev_load_cfg_by_hdr(struct aw_device *aw_dev,
{
int ret;
- struct aw_all_prof_info *all_prof_info __free(kfree) = kzalloc_obj(*all_prof_info,
- GFP_KERNEL);
+ struct aw_all_prof_info *all_prof_info __free(kfree) = kzalloc_obj(*all_prof_info);
if (!all_prof_info)
return -ENOMEM;
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 1f890294064c..ec4059f381be 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -2143,8 +2143,7 @@ static int da7219_register_dai_clks(struct snd_soc_component *component)
/* For DT platforms allocate onecell data for clock registration */
if (np) {
- clk_data = kzalloc_flex(*clk_data, hws, DA7219_DAI_NUM_CLKS,
- GFP_KERNEL);
+ clk_data = kzalloc_flex(*clk_data, hws, DA7219_DAI_NUM_CLKS);
if (!clk_data)
return -ENOMEM;
diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
index b6a2c39882ac..6233aa9f5bc6 100644
--- a/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@ -3820,8 +3820,7 @@ static int rx_macro_probe(struct platform_device *pdev)
rx->rxn_reg_stride = 0x80;
rx->rxn_reg_stride2 = 0xc;
def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_pre_2_5_defaults);
- reg_defaults = kmalloc_objs(struct reg_default, def_count,
- GFP_KERNEL);
+ reg_defaults = kmalloc_objs(struct reg_default, def_count);
if (!reg_defaults)
return -ENOMEM;
memcpy(&reg_defaults[0], rx_defaults, sizeof(rx_defaults));
@@ -3835,8 +3834,7 @@ static int rx_macro_probe(struct platform_device *pdev)
rx->rxn_reg_stride = 0xc0;
rx->rxn_reg_stride2 = 0x0;
def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_2_5_defaults);
- reg_defaults = kmalloc_objs(struct reg_default, def_count,
- GFP_KERNEL);
+ reg_defaults = kmalloc_objs(struct reg_default, def_count);
if (!reg_defaults)
return -ENOMEM;
memcpy(&reg_defaults[0], rx_defaults, sizeof(rx_defaults));
diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index e26aaea450d6..5ad0448af649 100644
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -2725,8 +2725,7 @@ static int wsa_macro_probe(struct platform_device *pdev)
case LPASS_CODEC_VERSION_2_1:
wsa->reg_layout = &wsa_codec_v2_1;
def_count = ARRAY_SIZE(wsa_defaults) + ARRAY_SIZE(wsa_defaults_v2_1);
- reg_defaults = kmalloc_objs(*reg_defaults, def_count,
- GFP_KERNEL);
+ reg_defaults = kmalloc_objs(*reg_defaults, def_count);
if (!reg_defaults)
return -ENOMEM;
memcpy(&reg_defaults[0], wsa_defaults, sizeof(wsa_defaults));
@@ -2741,8 +2740,7 @@ static int wsa_macro_probe(struct platform_device *pdev)
case LPASS_CODEC_VERSION_2_9:
wsa->reg_layout = &wsa_codec_v2_5;
def_count = ARRAY_SIZE(wsa_defaults) + ARRAY_SIZE(wsa_defaults_v2_5);
- reg_defaults = kmalloc_objs(*reg_defaults, def_count,
- GFP_KERNEL);
+ reg_defaults = kmalloc_objs(*reg_defaults, def_count);
if (!reg_defaults)
return -ENOMEM;
memcpy(&reg_defaults[0], wsa_defaults, sizeof(wsa_defaults));
diff --git a/sound/soc/codecs/tas2781-fmwlib.c b/sound/soc/codecs/tas2781-fmwlib.c
index 3304d20ab2ad..460fae51c2f5 100644
--- a/sound/soc/codecs/tas2781-fmwlib.c
+++ b/sound/soc/codecs/tas2781-fmwlib.c
@@ -509,8 +509,7 @@ static int fw_parse_data_kernel(struct tasdevice_fw *tas_fmw,
img_data->nr_blk = get_unaligned_be32(&data[offset]);
offset += 4;
- img_data->dev_blks = kzalloc_objs(struct tasdev_blk, img_data->nr_blk,
- GFP_KERNEL);
+ img_data->dev_blks = kzalloc_objs(struct tasdev_blk, img_data->nr_blk);
if (!img_data->dev_blks) {
offset = -ENOMEM;
goto out;
@@ -1239,8 +1238,7 @@ static int fw_parse_data(struct tasdevice_fw *tas_fmw,
img_data->nr_blk = get_unaligned_be16(&data[offset]);
offset += 2;
- img_data->dev_blks = kzalloc_objs(struct tasdev_blk, img_data->nr_blk,
- GFP_KERNEL);
+ img_data->dev_blks = kzalloc_objs(struct tasdev_blk, img_data->nr_blk);
if (!img_data->dev_blks) {
offset = -ENOMEM;
goto out;
@@ -1284,8 +1282,7 @@ static int fw_parse_program_data(struct tasdevice_priv *tas_priv,
}
tas_fmw->programs =
- kzalloc_objs(struct tasdevice_prog, tas_fmw->nr_programs,
- GFP_KERNEL);
+ kzalloc_objs(struct tasdevice_prog, tas_fmw->nr_programs);
if (!tas_fmw->programs) {
offset = -ENOMEM;
goto out;
@@ -2207,8 +2204,7 @@ int tas2781_load_calibration(void *context, char *file_name,
fmw.size = fw_entry->size;
fmw.data = fw_entry->data;
- tas_fmw = tasdev->cali_data_fmw = kzalloc_obj(struct tasdevice_fw,
- GFP_KERNEL);
+ tas_fmw = tasdev->cali_data_fmw = kzalloc_obj(struct tasdevice_fw);
if (!tasdev->cali_data_fmw) {
ret = -ENOMEM;
goto out;
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 1f4aac4017cf..2e23848e1dce 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1430,8 +1430,7 @@ static int wm_adsp_buffer_populate(struct wm_adsp_compr_buf *buf)
u32 offset = 0;
int i, ret;
- buf->regions = kzalloc_objs(*buf->regions, caps->num_regions,
- GFP_KERNEL);
+ buf->regions = kzalloc_objs(*buf->regions, caps->num_regions);
if (!buf->regions)
return -ENOMEM;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index ea76524d9b76..1630a10c7ea3 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3972,8 +3972,7 @@ static int dapm_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
* stuff that increases stack usage.
* So, we use kzalloc()/kfree() for params in this function.
*/
- struct snd_pcm_hw_params *params __free(kfree) = kzalloc_obj(*params,
- GFP_KERNEL);
+ struct snd_pcm_hw_params *params __free(kfree) = kzalloc_obj(*params);
if (!params)
return -ENOMEM;
diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
index dac8e7ba5981..8006777f2f64 100644
--- a/sound/soc/sof/ipc3-topology.c
+++ b/sound/soc/sof/ipc3-topology.c
@@ -1622,8 +1622,7 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget)
continue;
/* Reserve memory for all hw configs, eventually freed by widget */
- config = kzalloc_objs(*config, slink->num_hw_configs,
- GFP_KERNEL);
+ config = kzalloc_objs(*config, slink->num_hw_configs);
if (!config) {
ret = -ENOMEM;
goto free_comp;
diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index a2e9fef2760c..8371e54314b4 100644
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -865,8 +865,7 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
SOF_IPC4_NODE_INDEX_INTEL_DMIC(ipc4_copier->dai_index);
break;
default:
- ipc4_copier->gtw_attr = kzalloc_obj(*ipc4_copier->gtw_attr,
- GFP_KERNEL);
+ ipc4_copier->gtw_attr = kzalloc_obj(*ipc4_copier->gtw_attr);
if (!ipc4_copier->gtw_attr) {
ret = -ENOMEM;
goto free_available_fmt;
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index c38903144c72..450147b1abed 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -86,8 +86,7 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
emu->card = card;
emu->name = kstrdup_const(name, GFP_KERNEL);
- emu->voices = kzalloc_objs(struct snd_emux_voice, emu->max_voices,
- GFP_KERNEL);
+ emu->voices = kzalloc_objs(struct snd_emux_voice, emu->max_voices);
if (emu->name == NULL || emu->voices == NULL)
return -ENOMEM;
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index 62d1ba66721c..2ed01e9d79bb 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -136,8 +136,7 @@ snd_emux_create_port(struct snd_emux *emu, char *name,
if (!p)
return NULL;
- p->chset.channels = kzalloc_objs(*p->chset.channels, max_channels,
- GFP_KERNEL);
+ p->chset.channels = kzalloc_objs(*p->chset.channels, max_channels);
if (!p->chset.channels) {
kfree(p);
return NULL;
diff --git a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c
index 0e8be4efbf44..dd25a6407b63 100644
--- a/sound/usb/6fire/control.c
+++ b/sound/usb/6fire/control.c
@@ -551,8 +551,7 @@ int usb6fire_control_init(struct sfire_chip *chip)
{
int i;
int ret;
- struct control_runtime *rt = kzalloc_obj(struct control_runtime,
- GFP_KERNEL);
+ struct control_runtime *rt = kzalloc_obj(struct control_runtime);
struct comm_runtime *comm_rt = chip->comm;
if (!rt)
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index bad575fa4ed2..6dbaf30232f9 100644
--- a/sound/usb/line6/capture.c
+++ b/sound/usb/line6/capture.c
@@ -255,8 +255,7 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm)
struct usb_line6 *line6 = line6pcm->line6;
int i;
- line6pcm->in.urbs = kzalloc_objs(struct urb *, line6->iso_buffers,
- GFP_KERNEL);
+ line6pcm->in.urbs = kzalloc_objs(struct urb *, line6->iso_buffers);
if (line6pcm->in.urbs == NULL)
return -ENOMEM;
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index 5d3666ebaf83..7ebaf125f969 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -404,8 +404,7 @@ int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm)
struct usb_line6 *line6 = line6pcm->line6;
int i;
- line6pcm->out.urbs = kzalloc_objs(struct urb *, line6->iso_buffers,
- GFP_KERNEL);
+ line6pcm->out.urbs = kzalloc_objs(struct urb *, line6->iso_buffers);
if (line6pcm->out.urbs == NULL)
return -ENOMEM;
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 3c3b197de39d..ac8c71ba9483 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -3603,8 +3603,7 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
return -ENOMEM;
mixer->chip = chip;
mixer->ignore_ctl_error = !!(chip->quirk_flags & QUIRK_FLAG_IGNORE_CTL_ERROR);
- mixer->id_elems = kzalloc_objs(*mixer->id_elems, MAX_ID_ELEMS,
- GFP_KERNEL);
+ mixer->id_elems = kzalloc_objs(*mixer->id_elems, MAX_ID_ELEMS);
if (!mixer->id_elems) {
kfree(mixer);
return -ENOMEM;
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 9bc449ea9327..11e205da7964 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -274,8 +274,7 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!mixer->rc_urb)
return -ENOMEM;
- mixer->rc_setup_packet = kmalloc_obj(*mixer->rc_setup_packet,
- GFP_KERNEL);
+ mixer->rc_setup_packet = kmalloc_obj(*mixer->rc_setup_packet);
if (!mixer->rc_setup_packet) {
usb_free_urb(mixer->rc_urb);
mixer->rc_urb = NULL;
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 9dcd1d18c199..3808df54727d 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -942,8 +942,7 @@ static int usx2y_audio_stream_new(struct snd_card *card, int playback_endpoint,
for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;
i <= SNDRV_PCM_STREAM_CAPTURE; ++i) {
- usx2y_substream[i] = kzalloc_obj(struct snd_usx2y_substream,
- GFP_KERNEL);
+ usx2y_substream[i] = kzalloc_obj(struct snd_usx2y_substream);
if (!usx2y_substream[i])
return -ENOMEM;
diff --git a/sound/xen/xen_snd_front_alsa.c b/sound/xen/xen_snd_front_alsa.c
index 379a4a1cb911..dc626480123a 100644
--- a/sound/xen/xen_snd_front_alsa.c
+++ b/sound/xen/xen_snd_front_alsa.c
@@ -442,8 +442,7 @@ static int shbuf_setup_backstore(struct xen_snd_front_pcm_stream_info *stream,
stream->buffer_sz = buffer_sz;
stream->num_pages = DIV_ROUND_UP(stream->buffer_sz, PAGE_SIZE);
- stream->pages = kzalloc_objs(struct page *, stream->num_pages,
- GFP_KERNEL);
+ stream->pages = kzalloc_objs(struct page *, stream->num_pages);
if (!stream->pages)
return -ENOMEM;
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-22 13:49:20 +0000