summaryrefslogtreecommitdiff
path: root/sound/soc/sof
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/sof')
-rw-r--r--sound/soc/sof/compress.c2
-rw-r--r--sound/soc/sof/intel/apl.c2
-rw-r--r--sound/soc/sof/intel/cnl.c2
-rw-r--r--sound/soc/sof/intel/hda-mlink.c2
-rw-r--r--sound/soc/sof/intel/icl.c2
-rw-r--r--sound/soc/sof/intel/mtl.c2
-rw-r--r--sound/soc/sof/intel/skl.c2
-rw-r--r--sound/soc/sof/intel/telemetry.c4
-rw-r--r--sound/soc/sof/intel/tgl.c2
-rw-r--r--sound/soc/sof/ipc3-dtrace.c2
-rw-r--r--sound/soc/sof/ipc3-topology.c8
-rw-r--r--sound/soc/sof/ipc4-pcm.c4
-rw-r--r--sound/soc/sof/ipc4-topology.c20
-rw-r--r--sound/soc/sof/sof-client-probes-ipc4.c2
-rw-r--r--sound/soc/sof/sof-client.c4
-rw-r--r--sound/soc/sof/stream-ipc.c2
-rw-r--r--sound/soc/sof/topology.c22
17 files changed, 42 insertions, 42 deletions
diff --git a/sound/soc/sof/compress.c b/sound/soc/sof/compress.c
index f68fa3551df8..96570121aae0 100644
--- a/sound/soc/sof/compress.c
+++ b/sound/soc/sof/compress.c
@@ -101,7 +101,7 @@ static int sof_compr_open(struct snd_soc_component *component,
struct snd_sof_pcm *spcm;
int dir;
- sstream = kzalloc_obj(*sstream, GFP_KERNEL);
+ sstream = kzalloc_obj(*sstream);
if (!sstream)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
index 31494c686c72..b0072601181e 100644
--- a/sound/soc/sof/intel/apl.c
+++ b/sound/soc/sof/intel/apl.c
@@ -54,7 +54,7 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index b55dd9ace41f..660c1475e5a4 100644
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -401,7 +401,7 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/hda-mlink.c b/sound/soc/sof/intel/hda-mlink.c
index c9790f37928f..ce603a2343de 100644
--- a/sound/soc/sof/intel/hda-mlink.c
+++ b/sound/soc/sof/intel/hda-mlink.c
@@ -392,7 +392,7 @@ static int hda_ml_alloc_h2link(struct hdac_bus *bus, int index)
struct hdac_ext_link *hlink;
int ret;
- h2link = kzalloc_obj(*h2link, GFP_KERNEL);
+ h2link = kzalloc_obj(*h2link);
if (!h2link)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index 8079a1363b45..c1018893750c 100644
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -122,7 +122,7 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c
index e46b0fd5746f..9503d00e6002 100644
--- a/sound/soc/sof/intel/mtl.c
+++ b/sound/soc/sof/intel/mtl.c
@@ -734,7 +734,7 @@ int sof_mtl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops)
dsp_ops->core_get = mtl_dsp_core_get;
dsp_ops->core_put = mtl_dsp_core_put;
- sdev->private = kzalloc_obj(struct sof_ipc4_fw_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(struct sof_ipc4_fw_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/skl.c b/sound/soc/sof/intel/skl.c
index eb94027a5724..90519ebd3168 100644
--- a/sound/soc/sof/intel/skl.c
+++ b/sound/soc/sof/intel/skl.c
@@ -62,7 +62,7 @@ int sof_skl_ops_init(struct snd_sof_dev *sdev)
/* probe/remove/shutdown */
sof_skl_ops.shutdown = hda_dsp_shutdown;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/intel/telemetry.c b/sound/soc/sof/intel/telemetry.c
index 2e2cc6e2ea3a..967b5b577f03 100644
--- a/sound/soc/sof/intel/telemetry.c
+++ b/sound/soc/sof/intel/telemetry.c
@@ -29,7 +29,7 @@ void sof_ipc4_intel_dump_telemetry_state(struct snd_sof_dev *sdev, u32 flags)
if (!slot_offset)
return;
- telemetry_data = kmalloc_obj(*telemetry_data, GFP_KERNEL);
+ telemetry_data = kmalloc_obj(*telemetry_data);
if (!telemetry_data)
return;
sof_mailbox_read(sdev, slot_offset, telemetry_data, sizeof(*telemetry_data));
@@ -39,7 +39,7 @@ void sof_ipc4_intel_dump_telemetry_state(struct snd_sof_dev *sdev, u32 flags)
goto free_telemetry_data;
}
- block = kmalloc_obj(*block, GFP_KERNEL);
+ block = kmalloc_obj(*block);
if (!block)
goto free_telemetry_data;
diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index 1c07f5882e1c..7936361e2e39 100644
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -90,7 +90,7 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
struct sof_ipc4_fw_data *ipc4_data;
- sdev->private = kzalloc_obj(*ipc4_data, GFP_KERNEL);
+ sdev->private = kzalloc_obj(*ipc4_data);
if (!sdev->private)
return -ENOMEM;
diff --git a/sound/soc/sof/ipc3-dtrace.c b/sound/soc/sof/ipc3-dtrace.c
index d5cb86b2ad08..22053357731a 100644
--- a/sound/soc/sof/ipc3-dtrace.c
+++ b/sound/soc/sof/ipc3-dtrace.c
@@ -126,7 +126,7 @@ static int trace_filter_parse(struct snd_sof_dev *sdev, char *string,
capacity += TRACE_FILTER_ELEMENTS_PER_ENTRY;
entry = strchr(entry + 1, entry_delimiter[0]);
}
- *out = kmalloc_objs(**out, capacity, GFP_KERNEL);
+ *out = kmalloc_objs(**out, capacity);
if (!*out)
return -ENOMEM;
diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
index b4fc27727106..dac8e7ba5981 100644
--- a/sound/soc/sof/ipc3-topology.c
+++ b/sound/soc/sof/ipc3-topology.c
@@ -524,7 +524,7 @@ static int sof_ipc3_widget_setup_comp_pipeline(struct snd_sof_widget *swidget)
struct snd_sof_widget *comp_swidget;
int ret;
- pipeline = kzalloc_obj(*pipeline, GFP_KERNEL);
+ pipeline = kzalloc_obj(*pipeline);
if (!pipeline)
return -ENOMEM;
@@ -589,7 +589,7 @@ static int sof_ipc3_widget_setup_comp_buffer(struct snd_sof_widget *swidget)
struct sof_ipc_buffer *buffer;
int ret;
- buffer = kzalloc_obj(*buffer, GFP_KERNEL);
+ buffer = kzalloc_obj(*buffer);
if (!buffer)
return -ENOMEM;
@@ -893,7 +893,7 @@ static int sof_process_load(struct snd_soc_component *scomp,
/* allocate struct for widget control data sizes and types */
if (widget->num_kcontrols) {
- wdata = kzalloc_objs(*wdata, widget->num_kcontrols, GFP_KERNEL);
+ wdata = kzalloc_objs(*wdata, widget->num_kcontrols);
if (!wdata)
return -ENOMEM;
@@ -1567,7 +1567,7 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget)
struct snd_sof_dai_link *slink;
int ret;
- private = kzalloc_obj(*private, GFP_KERNEL);
+ private = kzalloc_obj(*private);
if (!private)
return -ENOMEM;
diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c
index a21dc53e1026..f82b080de4a9 100644
--- a/sound/soc/sof/ipc4-pcm.c
+++ b/sound/soc/sof/ipc4-pcm.c
@@ -939,7 +939,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
return -ENOMEM;
}
- stream_priv = kzalloc_obj(*stream_priv, GFP_KERNEL);
+ stream_priv = kzalloc_obj(*stream_priv);
if (!stream_priv) {
sof_ipc4_pcm_free(sdev, spcm);
return -ENOMEM;
@@ -951,7 +951,7 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm
if (!support_info || stream == SNDRV_PCM_STREAM_CAPTURE)
continue;
- time_info = kzalloc_obj(*time_info, GFP_KERNEL);
+ time_info = kzalloc_obj(*time_info);
if (!time_info) {
sof_ipc4_pcm_free(sdev, spcm);
return -ENOMEM;
diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index 051b02b222f9..a2e9fef2760c 100644
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -629,7 +629,7 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
int node_type = 0;
int ret, dir;
- ipc4_copier = kzalloc_obj(*ipc4_copier, GFP_KERNEL);
+ ipc4_copier = kzalloc_obj(*ipc4_copier);
if (!ipc4_copier)
return -ENOMEM;
@@ -690,7 +690,7 @@ static int sof_ipc4_widget_setup_pcm(struct snd_sof_widget *swidget)
}
skip_gtw_cfg:
- 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;
@@ -759,7 +759,7 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
int node_type = 0;
int ret;
- ipc4_copier = kzalloc_obj(*ipc4_copier, GFP_KERNEL);
+ ipc4_copier = kzalloc_obj(*ipc4_copier);
if (!ipc4_copier)
return -ENOMEM;
@@ -826,7 +826,7 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
break;
}
- blob = kzalloc_obj(*blob, GFP_KERNEL);
+ blob = kzalloc_obj(*blob);
if (!blob) {
ret = -ENOMEM;
goto free_available_fmt;
@@ -933,7 +933,7 @@ static int sof_ipc4_widget_setup_comp_pipeline(struct snd_sof_widget *swidget)
struct snd_sof_pipeline *spipe = swidget->spipe;
int ret;
- pipeline = kzalloc_obj(*pipeline, GFP_KERNEL);
+ pipeline = kzalloc_obj(*pipeline);
if (!pipeline)
return -ENOMEM;
@@ -992,7 +992,7 @@ static int sof_ipc4_widget_setup_comp_pga(struct snd_sof_widget *swidget)
struct sof_ipc4_gain *gain;
int ret;
- gain = kzalloc_obj(*gain, GFP_KERNEL);
+ gain = kzalloc_obj(*gain);
if (!gain)
return -ENOMEM;
@@ -1051,7 +1051,7 @@ static int sof_ipc4_widget_setup_comp_mixer(struct snd_sof_widget *swidget)
dev_dbg(scomp->dev, "Updating IPC structure for %s\n", swidget->widget->name);
- mixer = kzalloc_obj(*mixer, GFP_KERNEL);
+ mixer = kzalloc_obj(*mixer);
if (!mixer)
return -ENOMEM;
@@ -1083,7 +1083,7 @@ static int sof_ipc4_widget_setup_comp_src(struct snd_sof_widget *swidget)
dev_dbg(scomp->dev, "Updating IPC structure for %s\n", swidget->widget->name);
- src = kzalloc_obj(*src, GFP_KERNEL);
+ src = kzalloc_obj(*src);
if (!src)
return -ENOMEM;
@@ -1126,7 +1126,7 @@ static int sof_ipc4_widget_setup_comp_asrc(struct snd_sof_widget *swidget)
dev_dbg(scomp->dev, "Updating IPC structure for %s\n", swidget->widget->name);
- asrc = kzalloc_obj(*asrc, GFP_KERNEL);
+ asrc = kzalloc_obj(*asrc);
if (!asrc)
return -ENOMEM;
@@ -1209,7 +1209,7 @@ static int sof_ipc4_widget_setup_comp_process(struct snd_sof_widget *swidget)
void *cfg;
int ret;
- process = kzalloc_obj(*process, GFP_KERNEL);
+ process = kzalloc_obj(*process);
if (!process)
return -ENOMEM;
diff --git a/sound/soc/sof/sof-client-probes-ipc4.c b/sound/soc/sof/sof-client-probes-ipc4.c
index 2ab282e98a61..88397c7dc4c3 100644
--- a/sound/soc/sof/sof-client-probes-ipc4.c
+++ b/sound/soc/sof/sof-client-probes-ipc4.c
@@ -327,7 +327,7 @@ static int ipc4_probes_points_add(struct sof_client_dev *cdev,
* performance issue I wrote the conversion explicitly open for
* future development.
*/
- points = kzalloc_objs(*points, num_desc, GFP_KERNEL);
+ points = kzalloc_objs(*points, num_desc);
if (!points)
return -ENOMEM;
diff --git a/sound/soc/sof/sof-client.c b/sound/soc/sof/sof-client.c
index 6cc9b7616100..c7bbf09e547f 100644
--- a/sound/soc/sof/sof-client.c
+++ b/sound/soc/sof/sof-client.c
@@ -554,7 +554,7 @@ int sof_client_register_ipc_rx_handler(struct sof_client_dev *cdev,
return -EINVAL;
}
- event = kmalloc_obj(*event, GFP_KERNEL);
+ event = kmalloc_obj(*event);
if (!event)
return -ENOMEM;
@@ -608,7 +608,7 @@ int sof_client_register_fw_state_handler(struct sof_client_dev *cdev,
if (!callback)
return -EINVAL;
- event = kmalloc_obj(*event, GFP_KERNEL);
+ event = kmalloc_obj(*event);
if (!event)
return -ENOMEM;
diff --git a/sound/soc/sof/stream-ipc.c b/sound/soc/sof/stream-ipc.c
index e7541e1976b8..78758cf58f01 100644
--- a/sound/soc/sof/stream-ipc.c
+++ b/sound/soc/sof/stream-ipc.c
@@ -99,7 +99,7 @@ EXPORT_SYMBOL(sof_set_stream_data_offset);
int sof_stream_pcm_open(struct snd_sof_dev *sdev,
struct snd_pcm_substream *substream)
{
- struct sof_stream *stream = kmalloc_obj(*stream, GFP_KERNEL);
+ struct sof_stream *stream = kmalloc_obj(*stream);
if (!stream)
return -ENOMEM;
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 46d78de5d9da..18e2401152c8 100644
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -973,7 +973,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
dev_dbg(scomp->dev, "tplg: load control type %d name : %s\n",
hdr->type, hdr->name);
- scontrol = kzalloc_obj(*scontrol, GFP_KERNEL);
+ scontrol = kzalloc_obj(*scontrol);
if (!scontrol)
return -ENOMEM;
@@ -1233,7 +1233,7 @@ static int sof_widget_parse_tokens(struct snd_soc_component *scomp, struct snd_s
num_tuples += token_list[object_token_list[i]].count;
/* allocate memory for tuples array */
- swidget->tuples = kzalloc_objs(*swidget->tuples, num_tuples, GFP_KERNEL);
+ swidget->tuples = kzalloc_objs(*swidget->tuples, num_tuples);
if (!swidget->tuples)
return -ENOMEM;
@@ -1420,7 +1420,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
int token_list_size = 0;
int ret = 0;
- swidget = kzalloc_obj(*swidget, GFP_KERNEL);
+ swidget = kzalloc_obj(*swidget);
if (!swidget)
return -ENOMEM;
@@ -1496,7 +1496,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
switch (w->id) {
case snd_soc_dapm_dai_in:
case snd_soc_dapm_dai_out:
- dai = kzalloc_obj(*dai, GFP_KERNEL);
+ dai = kzalloc_obj(*dai);
if (!dai) {
ret = -ENOMEM;
goto widget_free;
@@ -1586,7 +1586,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
if (w->id == snd_soc_dapm_scheduler) {
struct snd_sof_pipeline *spipe;
- spipe = kzalloc_obj(*spipe, GFP_KERNEL);
+ spipe = kzalloc_obj(*spipe);
if (!spipe) {
ret = -ENOMEM;
goto free;
@@ -1739,7 +1739,7 @@ static int sof_dai_load(struct snd_soc_component *scomp, int index,
if (!pcm)
return 0;
- spcm = kzalloc_obj(*spcm, GFP_KERNEL);
+ spcm = kzalloc_obj(*spcm);
if (!spcm)
return -ENOMEM;
@@ -1906,7 +1906,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_
return -EINVAL;
}
- slink = kzalloc_obj(*slink, GFP_KERNEL);
+ slink = kzalloc_obj(*slink);
if (!slink)
return -ENOMEM;
@@ -1999,7 +1999,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_
}
/* allocate memory for tuples array */
- slink->tuples = kzalloc_objs(*slink->tuples, num_tuples, GFP_KERNEL);
+ slink->tuples = kzalloc_objs(*slink->tuples, num_tuples);
if (!slink->tuples) {
kfree(slink->hw_configs);
kfree(slink);
@@ -2094,7 +2094,7 @@ static int sof_route_load(struct snd_soc_component *scomp, int index,
int ret = 0;
/* allocate memory for sroute and connect */
- sroute = kzalloc_obj(*sroute, GFP_KERNEL);
+ sroute = kzalloc_obj(*sroute);
if (!sroute)
return -ENOMEM;
@@ -2398,11 +2398,11 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index,
struct snd_sof_widget *swidget;
struct snd_sof_dai *sdai;
- swidget = kzalloc_obj(*swidget, GFP_KERNEL);
+ swidget = kzalloc_obj(*swidget);
if (!swidget)
return -ENOMEM;
- sdai = kzalloc_obj(*sdai, GFP_KERNEL);
+ sdai = kzalloc_obj(*sdai);
if (!sdai) {
kfree(swidget);
return -ENOMEM;