ALSA: ctxfi: Simplify dao_clear_{left,right}_input() functions
PATCH v3 1/1 ALSA: ctxfi: Simplify dao_clear_{left,right}_input() functions
There was a lote of code duplication in the dao_clear_left_input() and dao_clear_right_input() functions. A new function, dao_clear_input(), was created and now the left and right functions call it instead of repeating themselves.
Link https://lore.kernel.org/lkml/NyKCr2VHK_xCQDwNxFKKx2LVd2d_AC2f2j4eAvnD9uRPtb50i2AruCLOp6mHxsGiyYJ0Tgd3Z50Oy1JTi5gPhjd2WQM2skrv7asp3fLl8HU=@ethancedwards.com/ open here
Signed-off-by Ethan Carter Edwards <[email protected]>
---
v3: remove temp variables
v2: email client woes
sound/pci/ctxfi/ctdaio.c | 48 +++++++++++----------------------------- 1 file changed, 13 insertions(+), 35 deletions(-)
sound/pci/ctxfi/ctdaio.c +13 -35
@@ -211,52 +211,30 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)return 0 ; } -static int dao_clear_left_input (struct dao *dao) +static int dao_clear_input (struct dao *dao,unsigned int start,unsigned int end) { -struct imapper *entry; -struct daio *daio = &dao->daio; -int i; +unsigned int i; -if (!dao->imappers[0 ]) +if (!dao->imappers[start])return 0 ; - - entry = dao->imappers[0 ]; - dao->mgr->imap_delete (dao->mgr, entry); -/* Program conjugate resources */ -for (i =1 ; i < daio->rscl.msr; i++) { - entry = dao->imappers[i]; - dao->mgr->imap_delete (dao->mgr, entry); +for (i = start; i < end; i++) { + dao->mgr->imap_delete (dao->mgr, dao->imappers[i]); dao->imappers[i] =NULL ; } -kfree (dao->imappers[0 ]); - dao->imappers[0 ] =NULL ; -return 0 ; } -static int dao_clear_right_input (struct dao *dao) -{ -struct imapper *entry; -struct daio *daio = &dao->daio; -int i; -if (!dao->imappers[daio->rscl.msr]) -return 0 ; - - entry = dao->imappers[daio->rscl.msr]; - dao->mgr->imap_delete (dao->mgr, entry); -/* Program conjugate resources */ -for (i =1 ; i < daio->rscr.msr; i++) { - entry = dao->imappers[daio->rscl.msr + i]; - dao->mgr->imap_delete (dao->mgr, entry); - dao->imappers[daio->rscl.msr + i] =NULL ; - } - -kfree (dao->imappers[daio->rscl.msr]); - dao->imappers[daio->rscl.msr] =NULL ; +static int dao_clear_left_input (struct dao *dao) +{ +return dao_clear_input (dao,0 , dao->daio.rscl.msr); +} -return 0 ; +static int dao_clear_right_input (struct dao *dao) +{ +return dao_clear_input (dao, dao->daio.rscl.msr, + dao->daio.rscl.msr + dao->daio.rscr.msr); }static const struct dao_rsc_ops dao_ops = {
Signature · 1 line
2.48.0
Takashi Iwai
AppliedQuoted 8 lines · Ethan Carter Edwards
There was a lote of code duplication in the
dao_clear_left_input()anddao_clear_right_input()functions. A new function,dao_clear_input(), was created and now the left and right functions call it instead of repeating themselves.
Thanks, applied.
Takashi