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

Commit f1b4863a authored by Geyslan G. Bem's avatar Geyslan G. Bem Committed by Takashi Iwai
Browse files

ALSA: emu10k1: code refactoring 



Partially restructures _snd_emu10k1_audigy_init_efx() and
_snd_emu10k1_init_efx() functions.

Be noted that the cast is demanded to use '__user'. So, in these cases,
avoid patches based on the coccinelle 'drop_kmalloc_cast' semantic patch.

Signed-off-by: default avatarGeyslan G. Bem <geyslan@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a4e9a38b

sound/pci/emu10k1/emufx.c

+45 −31
Original line number Diff line number Diff line
@@ -1182,15 +1182,20 @@ static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu) 
	u32 *gpr_map;

	mm_segment_t seg;



	if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||

	    (icode->gpr_map = (u_int32_t __user *)

	     kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t),

		     GFP_KERNEL)) == NULL ||

	    (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,

				sizeof(*controls), GFP_KERNEL)) == NULL) {

	err = -ENOMEM;

		goto __err;

	}

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

	if (!icode)

		return err;



	icode->gpr_map = (u_int32_t __user *) kcalloc(512 + 256 + 256 + 2 * 1024,

						      sizeof(u_int32_t), GFP_KERNEL);

	if (!icode->gpr_map)

		goto __err_gpr;

	controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,

			   sizeof(*controls), GFP_KERNEL);

	if (!controls)

		goto __err_ctrls;



	gpr_map = (u32 __force *)icode->gpr_map;



	icode->tram_data_map = icode->gpr_map + 512;
@@ -1743,10 +1748,10 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 


__err:

	kfree(controls);

	if (icode != NULL) {

__err_ctrls:

	kfree((void __force *)icode->gpr_map);

__err_gpr:

	kfree(icode);

	}

	return err;

}
@@ -1813,18 +1818,26 @@ static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu) 
	u32 *gpr_map;

	mm_segment_t seg;



	if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)

		return -ENOMEM;

	if ((icode->gpr_map = (u_int32_t __user *)

	     kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t),

		     GFP_KERNEL)) == NULL ||

            (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,

				sizeof(struct snd_emu10k1_fx8010_control_gpr),

				GFP_KERNEL)) == NULL ||

	    (ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {

	err = -ENOMEM;

		goto __err;

	}

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

	if (!icode)

		return err;



	icode->gpr_map = (u_int32_t __user *) kcalloc(256 + 160 + 160 + 2 * 512,

						      sizeof(u_int32_t), GFP_KERNEL);

	if (!icode->gpr_map)

		goto __err_gpr;



	controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,

			   sizeof(struct snd_emu10k1_fx8010_control_gpr),

			   GFP_KERNEL);

	if (!controls)

		goto __err_ctrls;



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

	if (!ipcm)

		goto __err_ipcm;



	gpr_map = (u32 __force *)icode->gpr_map;



	icode->tram_data_map = icode->gpr_map + 256;
@@ -2365,11 +2378,12 @@ static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu) 
		err = snd_emu10k1_ipcm_poke(emu, ipcm);

__err:

	kfree(ipcm);

__err_ipcm:

	kfree(controls);

	if (icode != NULL) {

__err_ctrls:

	kfree((void __force *)icode->gpr_map);

__err_gpr:

	kfree(icode);

	}

	return err;

}