@@ -325,7 +325,6 @@ static int rtnr_params(struct comp_dev *dev, struct sof_ipc_stream_params *param
325325 int ret ;
326326 struct comp_data * cd = comp_get_drvdata (dev );
327327 struct comp_buffer * sinkb , * sourceb ;
328- struct comp_buffer * sink_c , * source_c ;
329328 bool channels_valid ;
330329
331330 comp_info (dev , "rtnr_params()" );
@@ -341,21 +340,17 @@ static int rtnr_params(struct comp_dev *dev, struct sof_ipc_stream_params *param
341340 sinkb = list_first_item (& dev -> bsink_list , struct comp_buffer ,
342341 source_list );
343342
344- source_c = buffer_acquire (sourceb );
345- sink_c = buffer_acquire (sinkb );
346-
347343 /* set source/sink_frames/rate */
348- cd -> source_rate = audio_stream_get_rate (& source_c -> stream );
349- cd -> sink_rate = audio_stream_get_rate (& sink_c -> stream );
350- cd -> sources_stream [0 ].rate = audio_stream_get_rate (& source_c -> stream );
351- cd -> sink_stream .rate = audio_stream_get_rate (& sink_c -> stream );
352- channels_valid = audio_stream_get_channels (& source_c -> stream ) ==
353- audio_stream_get_channels (& sink_c -> stream );
344+ cd -> source_rate = audio_stream_get_rate (& sourceb -> stream );
345+ cd -> sink_rate = audio_stream_get_rate (& sinkb -> stream );
346+ cd -> sources_stream [0 ].rate = audio_stream_get_rate (& sourceb -> stream );
347+ cd -> sink_stream .rate = audio_stream_get_rate (& sinkb -> stream );
348+ channels_valid = audio_stream_get_channels (& sourceb -> stream ) ==
349+ audio_stream_get_channels (& sinkb -> stream );
354350
355351 if (!cd -> sink_rate ) {
356352 comp_err (dev , "rtnr_nr_params(), zero sink rate" );
357- ret = - EINVAL ;
358- goto out ;
353+ return - EINVAL ;
359354 }
360355
361356 /* Currently support 16kHz sample rate only. */
@@ -369,31 +364,25 @@ static int rtnr_params(struct comp_dev *dev, struct sof_ipc_stream_params *param
369364 default :
370365 comp_err (dev , "rtnr_nr_params(), invalid sample rate(%d kHz)" ,
371366 cd -> source_rate );
372- ret = - EINVAL ;
373- goto out ;
367+ return - EINVAL ;
374368 }
375369
376370 if (!channels_valid ) {
377371 comp_err (dev , "rtnr_params(), source/sink stream must have same channels" );
378- ret = - EINVAL ;
379- goto out ;
372+ return - EINVAL ;
380373 }
381374
382375 /* set source/sink stream channels */
383- cd -> sources_stream [0 ].channels = audio_stream_get_channels (& source_c -> stream );
384- cd -> sink_stream .channels = audio_stream_get_channels (& sink_c -> stream );
376+ cd -> sources_stream [0 ].channels = audio_stream_get_channels (& sourceb -> stream );
377+ cd -> sink_stream .channels = audio_stream_get_channels (& sinkb -> stream );
385378
386379 /* set source/sink stream overrun/underrun permitted */
387- cd -> sources_stream [0 ].overrun_permitted = audio_stream_get_overrun (& source_c -> stream );
388- cd -> sink_stream .overrun_permitted = audio_stream_get_overrun (& sink_c -> stream );
389- cd -> sources_stream [0 ].underrun_permitted = audio_stream_get_underrun (& source_c -> stream );
390- cd -> sink_stream .underrun_permitted = audio_stream_get_underrun (& sink_c -> stream );
391-
392- out :
393- buffer_release (sink_c );
394- buffer_release (source_c );
380+ cd -> sources_stream [0 ].overrun_permitted = audio_stream_get_overrun (& sourceb -> stream );
381+ cd -> sink_stream .overrun_permitted = audio_stream_get_overrun (& sinkb -> stream );
382+ cd -> sources_stream [0 ].underrun_permitted = audio_stream_get_underrun (& sourceb -> stream );
383+ cd -> sink_stream .underrun_permitted = audio_stream_get_underrun (& sinkb -> stream );
395384
396- return ret ;
385+ return 0 ;
397386}
398387
399388static int rtnr_get_comp_config (struct comp_data * cd , struct sof_ipc_ctrl_data * cdata ,
@@ -874,10 +863,8 @@ static int rtnr_prepare(struct comp_dev *dev)
874863
875864 /* Get sink data format */
876865 sinkb = list_first_item (& dev -> bsink_list , struct comp_buffer , source_list );
877- sink_c = buffer_acquire (sinkb );
878- cd -> sink_format = audio_stream_get_frm_fmt (& sink_c -> stream );
879- cd -> sink_stream .frame_fmt = audio_stream_get_frm_fmt (& sink_c -> stream );
880- buffer_release (sink_c );
866+ cd -> sink_format = audio_stream_get_frm_fmt (& sinkb -> stream );
867+ cd -> sink_stream .frame_fmt = audio_stream_get_frm_fmt (& sinkb -> stream );
881868
882869 /* Check source and sink PCM format and get processing function */
883870 comp_info (dev , "rtnr_prepare(), sink_format=%d" , cd -> sink_format );
0 commit comments