Unverified Commit 0ab000e5 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: tidyup rsnd_ssiu_busif_err_irq_ctrl() 



rsnd_ssiu_busif_err_irq_ctrl() has very similar duplicated code.
This patch merge and tidyup the code.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Message-Id: <87sg28lwxw.wl-kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cfb7b8bf

sound/soc/sh/rcar/ssiu.c

+17 −21
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ static const int gen3_id[] = { 0, 8, 16, 24, 32, 40, 41, 42, 43, 44 }; 
#define rsnd_ssiu_busif_err_irq_disable(mod) rsnd_ssiu_busif_err_irq_ctrl(mod, 0)

static void rsnd_ssiu_busif_err_irq_ctrl(struct rsnd_mod *mod, int enable)

{

	u32 sys_int_enable = 0;

	int id = rsnd_mod_id(mod);

	int shift, offset;

	int i;



	switch (id) {
@@ -60,29 +60,25 @@ static void rsnd_ssiu_busif_err_irq_ctrl(struct rsnd_mod *mod, int enable) 
	case 2:

	case 3:

	case 4:

		for (i = 0; i < 4; i++) {

			sys_int_enable = rsnd_mod_read(mod, SSI_SYS_INT_ENABLE(i * 2));

			if (enable)

				sys_int_enable |= 0xf << (id * 4);

			else

				sys_int_enable &= ~(0xf << (id * 4));

			rsnd_mod_write(mod,

				       SSI_SYS_INT_ENABLE(i * 2),

				       sys_int_enable);

		}

		shift  = id;

		offset = 0;

		break;

	case 9:

		shift  = 1;

		offset = 1;

		break;

	}



	for (i = 0; i < 4; i++) {

			sys_int_enable = rsnd_mod_read(mod, SSI_SYS_INT_ENABLE((i * 2) + 1));

		enum rsnd_reg reg = SSI_SYS_INT_ENABLE((i * 2) + offset);

		u32 val = 0xf << (shift * 4);

		u32 sys_int_enable = rsnd_mod_read(mod, reg);



		if (enable)

				sys_int_enable |= 0xf << 4;

			sys_int_enable |= val;

		else

				sys_int_enable &= ~(0xf << 4);

			rsnd_mod_write(mod,

				       SSI_SYS_INT_ENABLE((i * 2) + 1),

				       sys_int_enable);

		}

		break;

			sys_int_enable &= ~val;

		rsnd_mod_write(mod, reg, sys_int_enable);

	}

}