Skip to content

Commit 171f648

Browse files
committed
audio: (cosmetic) simplify multiple return statements
Avoid using "ret" variables where the value can be returned directly. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent fa18fe5 commit 171f648

5 files changed

Lines changed: 12 additions & 19 deletions

File tree

src/audio/crossover/crossover.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ static int crossover_prepare(struct processing_module *mod,
531531
struct comp_dev *dev = mod->dev;
532532
struct comp_buffer *source, *sink;
533533
int channels;
534-
int ret = 0;
535534

536535
comp_info(dev, "crossover_prepare()");
537536

@@ -550,11 +549,8 @@ static int crossover_prepare(struct processing_module *mod,
550549
if (cd->source_format != audio_stream_get_frm_fmt(&sink->stream)) {
551550
comp_err(dev, "crossover_prepare(): Source fmt %d and sink fmt %d are different.",
552551
cd->source_format, audio_stream_get_frm_fmt(&sink->stream));
553-
ret = -EINVAL;
552+
return -EINVAL;
554553
}
555-
556-
if (ret < 0)
557-
return ret;
558554
}
559555

560556
comp_info(dev, "crossover_prepare(), source_format=%d, sink_formats=%d, nch=%d",
@@ -570,7 +566,8 @@ static int crossover_prepare(struct processing_module *mod,
570566
}
571567

572568
if (cd->config) {
573-
ret = crossover_setup(mod, channels);
569+
int ret = crossover_setup(mod, channels);
570+
574571
if (ret < 0) {
575572
comp_err(dev, "crossover_prepare(), setup failed");
576573
return ret;

src/audio/eq_iir/eq_iir_ipc4.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static int eq_iir_params(struct processing_module *mod)
105105
struct comp_dev *dev = mod->dev;
106106
struct comp_buffer *sinkb;
107107
enum sof_ipc_frame valid_fmt, frame_fmt;
108-
int i, ret;
108+
int i;
109109

110110
comp_dbg(dev, "eq_iir_params()");
111111
comp_params = *params;
@@ -125,8 +125,7 @@ static int eq_iir_params(struct processing_module *mod)
125125

126126
component_set_nearest_period_frames(dev, comp_params.rate);
127127
sinkb = comp_dev_get_first_data_consumer(dev);
128-
ret = buffer_set_params(sinkb, &comp_params, true);
129-
return ret;
128+
return buffer_set_params(sinkb, &comp_params, true);
130129
}
131130

132131
void eq_iir_set_passthrough_func(struct comp_data *cd,

src/audio/module_adapter/module/generic.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ int module_prepare(struct processing_module *mod,
177177
struct sof_source **sources, int num_of_sources,
178178
struct sof_sink **sinks, int num_of_sinks)
179179
{
180-
int ret = 0;
181180
struct module_data *md = &mod->priv;
182181
struct comp_dev *dev = mod->dev;
183182
const struct module_interface *const ops = dev->drv->adapter_ops;
@@ -191,7 +190,8 @@ int module_prepare(struct processing_module *mod,
191190
return -EPERM;
192191
#endif
193192
if (ops->prepare) {
194-
ret = ops->prepare(mod, sources, num_of_sources, sinks, num_of_sinks);
193+
int ret = ops->prepare(mod, sources, num_of_sources, sinks, num_of_sinks);
194+
195195
if (ret) {
196196
comp_err(dev, "module_prepare() error %d: module specific prepare failed, comp_id %d",
197197
ret, dev_comp_id(dev));
@@ -213,7 +213,7 @@ int module_prepare(struct processing_module *mod,
213213
#endif
214214
comp_dbg(dev, "module_prepare() done");
215215

216-
return ret;
216+
return 0;
217217
}
218218

219219
int module_process_legacy(struct processing_module *mod,

src/audio/module_adapter/module_adapter_ipc3.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ int module_adapter_sink_src_prepare(struct comp_dev *dev)
321321
struct processing_module *mod = comp_mod(dev);
322322
struct comp_buffer *sink_buffer;
323323
struct comp_buffer *source_buffer;
324-
int ret;
325324
int i;
326325

327326
/* acquire all sink and source buffers, get handlers to sink/source API */
@@ -340,7 +339,6 @@ int module_adapter_sink_src_prepare(struct comp_dev *dev)
340339
mod->num_of_sources = i;
341340

342341
/* Prepare module */
343-
ret = module_prepare(mod, mod->sources, mod->num_of_sources, mod->sinks, mod->num_of_sinks);
344-
345-
return ret;
342+
return module_prepare(mod, mod->sources, mod->num_of_sources, mod->sinks,
343+
mod->num_of_sinks);
346344
}

src/audio/multiband_drc/multiband_drc_ipc4.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ int multiband_drc_params(struct processing_module *mod)
8080
struct comp_dev *dev = mod->dev;
8181
struct comp_buffer *sinkb;
8282
enum sof_ipc_frame valid_fmt, frame_fmt;
83-
int i, ret;
83+
int i;
8484

8585
comp_dbg(dev, "multiband_drc_params()");
8686

@@ -101,8 +101,7 @@ int multiband_drc_params(struct processing_module *mod)
101101

102102
component_set_nearest_period_frames(dev, comp_params.rate);
103103
sinkb = comp_dev_get_first_data_consumer(dev);
104-
ret = buffer_set_params(sinkb, &comp_params, true);
105104

106-
return ret;
105+
return buffer_set_params(sinkb, &comp_params, true);
107106
}
108107

0 commit comments

Comments
 (0)