Commit e576e784 authored by Ethan Carter Edwards's avatar Ethan Carter Edwards Committed by Takashi Iwai
Browse files

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: default avatarEthan Carter Edwards <ethan@ethancedwards.com>
Link: https://patch.msgid.link/x3glr6fetk7d7hlqimkv6g5krz2oibe7yusms3d7zk4ofrhlrx@75avihssncc5


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7bba999e

sound/pci/ctxfi/ctdaio.c

+13 −35
Original line number Diff line number Diff line
@@ -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;

static int dao_clear_left_input(struct dao *dao)

{

	return dao_clear_input(dao, 0, dao->daio.rscl.msr);

}



	kfree(dao->imappers[daio->rscl.msr]);

	dao->imappers[daio->rscl.msr] = NULL;



	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 = {