Skip to content

Commit e576e78

Browse files
ethancedwards8tiwai
authored andcommitted
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/ Signed-off-by: Ethan Carter Edwards <[email protected]> Link: https://patch.msgid.link/x3glr6fetk7d7hlqimkv6g5krz2oibe7yusms3d7zk4ofrhlrx@75avihssncc5 Signed-off-by: Takashi Iwai <[email protected]>
1 parent 7bba999 commit e576e78

File tree

1 file changed

+13
-35
lines changed

1 file changed

+13
-35
lines changed

sound/pci/ctxfi/ctdaio.c

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -211,52 +211,30 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)
211211
return 0;
212212
}
213213

214-
static int dao_clear_left_input(struct dao *dao)
214+
static int dao_clear_input(struct dao *dao, unsigned int start, unsigned int end)
215215
{
216-
struct imapper *entry;
217-
struct daio *daio = &dao->daio;
218-
int i;
216+
unsigned int i;
219217

220-
if (!dao->imappers[0])
218+
if (!dao->imappers[start])
221219
return 0;
222-
223-
entry = dao->imappers[0];
224-
dao->mgr->imap_delete(dao->mgr, entry);
225-
/* Program conjugate resources */
226-
for (i = 1; i < daio->rscl.msr; i++) {
227-
entry = dao->imappers[i];
228-
dao->mgr->imap_delete(dao->mgr, entry);
220+
for (i = start; i < end; i++) {
221+
dao->mgr->imap_delete(dao->mgr, dao->imappers[i]);
229222
dao->imappers[i] = NULL;
230223
}
231224

232-
kfree(dao->imappers[0]);
233-
dao->imappers[0] = NULL;
234-
235225
return 0;
236226
}
237227

238-
static int dao_clear_right_input(struct dao *dao)
239-
{
240-
struct imapper *entry;
241-
struct daio *daio = &dao->daio;
242-
int i;
243228

244-
if (!dao->imappers[daio->rscl.msr])
245-
return 0;
246-
247-
entry = dao->imappers[daio->rscl.msr];
248-
dao->mgr->imap_delete(dao->mgr, entry);
249-
/* Program conjugate resources */
250-
for (i = 1; i < daio->rscr.msr; i++) {
251-
entry = dao->imappers[daio->rscl.msr + i];
252-
dao->mgr->imap_delete(dao->mgr, entry);
253-
dao->imappers[daio->rscl.msr + i] = NULL;
254-
}
255-
256-
kfree(dao->imappers[daio->rscl.msr]);
257-
dao->imappers[daio->rscl.msr] = NULL;
229+
static int dao_clear_left_input(struct dao *dao)
230+
{
231+
return dao_clear_input(dao, 0, dao->daio.rscl.msr);
232+
}
258233

259-
return 0;
234+
static int dao_clear_right_input(struct dao *dao)
235+
{
236+
return dao_clear_input(dao, dao->daio.rscl.msr,
237+
dao->daio.rscl.msr + dao->daio.rscr.msr);
260238
}
261239

262240
static const struct dao_rsc_ops dao_ops = {

0 commit comments

Comments
 (0)