Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5395103d authored by Joe Perches's avatar Joe Perches Committed by Takashi Iwai
Browse files

ALSA: ctxfi: Neaten get_daio_rsc 



Move the pointer declarations into the blocks that use them.
Neaten the kfree calls when the _init functions fail.

Trivially reduces object size (defconfig x86-64)

$ size sound/pci/ctxfi/ctdaio.o.*
   text	   data	    bss	    dec	    hex	filename
   5287	    224	      0	   5511	   1587	sound/pci/ctxfi/ctdaio.o.new
   5319	    224	      0	   5543	   15a7	sound/pci/ctxfi/ctdaio.o.old

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Noticed-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 103884a3

sound/pci/ctxfi/ctdaio.c

+13 −17
Original line number Diff line number Diff line
@@ -528,8 +528,6 @@ static int get_daio_rsc(struct daio_mgr *mgr, 
			struct daio **rdaio)

{

	int err;

	struct dai *dai = NULL;

	struct dao *dao = NULL;

	unsigned long flags;



	*rdaio = NULL;
@@ -544,27 +542,30 @@ static int get_daio_rsc(struct daio_mgr *mgr, 
		return err;

	}



	err = -ENOMEM;

	/* Allocate mem for daio resource */

	if (desc->type <= DAIO_OUT_MAX) {

		dao = kzalloc(sizeof(*dao), GFP_KERNEL);

		if (!dao) {

			err = -ENOMEM;

		struct dao *dao = kzalloc(sizeof(*dao), GFP_KERNEL);

		if (!dao)

			goto error;

		}



		err = dao_rsc_init(dao, desc, mgr);

		if (err)

		if (err) {

			kfree(dao);

			goto error;

		}



		*rdaio = &dao->daio;

	} else {

		dai = kzalloc(sizeof(*dai), GFP_KERNEL);

		if (!dai) {

			err = -ENOMEM;

		struct dai *dai = kzalloc(sizeof(*dai), GFP_KERNEL);

		if (!dai)

			goto error;

		}



		err = dai_rsc_init(dai, desc, mgr);

		if (err)

		if (err) {

			kfree(dai);

			goto error;

		}



		*rdaio = &dai->daio;

	}
@@ -575,11 +576,6 @@ static int get_daio_rsc(struct daio_mgr *mgr, 
	return 0;



error:

	if (dao)

		kfree(dao);

	else if (dai)

		kfree(dai);



	spin_lock_irqsave(&mgr->mgr_lock, flags);

	daio_mgr_put_rsc(&mgr->mgr, desc->type);

	spin_unlock_irqrestore(&mgr->mgr_lock, flags);