Commit 514eef9c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ctxfi - Remove useless initializations and cast 



Remove useless variable initializations and cast at the beginning of
functions.

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

sound/pci/ctxfi/ctamixer.c

+31 −31
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ static struct rsc_ops amixer_basic_rsc_ops = { 


static int amixer_set_input(struct amixer *amixer, struct rsc *rsc)

{

	struct hw *hw = NULL;

	struct hw *hw;



	hw = (struct hw *)amixer->rsc.hw;

	hw = amixer->rsc.hw;

	hw->amixer_set_mode(amixer->rsc.ctrl_blk, AMIXER_Y_IMMEDIATE);

	amixer->input = rsc;

	if (NULL == rsc)
@@ -75,9 +75,9 @@ static int amixer_set_input(struct amixer *amixer, struct rsc *rsc) 
/* y is a 14-bit immediate constant */

static int amixer_set_y(struct amixer *amixer, unsigned int y)

{

	struct hw *hw = NULL;

	struct hw *hw;



	hw = (struct hw *)amixer->rsc.hw;

	hw = amixer->rsc.hw;

	hw->amixer_set_y(amixer->rsc.ctrl_blk, y);



	return 0;
@@ -85,9 +85,9 @@ static int amixer_set_y(struct amixer *amixer, unsigned int y) 


static int amixer_set_invalid_squash(struct amixer *amixer, unsigned int iv)

{

	struct hw *hw = NULL;

	struct hw *hw;



	hw = (struct hw *)amixer->rsc.hw;

	hw = amixer->rsc.hw;

	hw->amixer_set_iv(amixer->rsc.ctrl_blk, iv);



	return 0;
@@ -95,9 +95,9 @@ static int amixer_set_invalid_squash(struct amixer *amixer, unsigned int iv) 


static int amixer_set_sum(struct amixer *amixer, struct sum *sum)

{

	struct hw *hw = NULL;

	struct hw *hw;



	hw = (struct hw *)amixer->rsc.hw;

	hw = amixer->rsc.hw;

	amixer->sum = sum;

	if (NULL == sum) {

		hw->amixer_set_se(amixer->rsc.ctrl_blk, 0);
@@ -112,13 +112,13 @@ static int amixer_set_sum(struct amixer *amixer, struct sum *sum) 


static int amixer_commit_write(struct amixer *amixer)

{

	struct hw *hw = NULL;

	unsigned int index = 0;

	int i = 0;

	struct rsc *input = NULL;

	struct sum *sum = NULL;

	struct hw *hw;

	unsigned int index;

	int i;

	struct rsc *input;

	struct sum *sum;



	hw = (struct hw *)amixer->rsc.hw;

	hw = amixer->rsc.hw;

	input = amixer->input;

	sum = amixer->sum;
@@ -158,10 +158,10 @@ static int amixer_commit_write(struct amixer *amixer) 


static int amixer_commit_raw_write(struct amixer *amixer)

{

	struct hw *hw = NULL;

	unsigned int index = 0;

	struct hw *hw;

	unsigned int index;



	hw = (struct hw *)amixer->rsc.hw;

	hw = amixer->rsc.hw;

	index = amixer->rsc.ops->output_slot(&amixer->rsc);

	hw->amixer_commit_write(hw, index, amixer->rsc.ctrl_blk);
@@ -170,9 +170,9 @@ static int amixer_commit_raw_write(struct amixer *amixer) 


static int amixer_get_y(struct amixer *amixer)

{

	struct hw *hw = NULL;

	struct hw *hw;



	hw = (struct hw *)amixer->rsc.hw;

	hw = amixer->rsc.hw;

	return hw->amixer_get_y(amixer->rsc.ctrl_blk);

}
@@ -201,7 +201,7 @@ static int amixer_rsc_init(struct amixer *amixer, 
			   const struct amixer_desc *desc,

			   struct amixer_mgr *mgr)

{

	int err = 0;

	int err;



	err = rsc_init(&amixer->rsc, amixer->idx[0],

			AMIXER, desc->msr, mgr->mgr.hw);
@@ -233,9 +233,9 @@ static int get_amixer_rsc(struct amixer_mgr *mgr, 
			  const struct amixer_desc *desc,

			  struct amixer **ramixer)

{

	int err = 0, i = 0;

	unsigned int idx = 0;

	struct amixer *amixer = NULL;

	int err, i;

	unsigned int idx;

	struct amixer *amixer;

	unsigned long flags;



	*ramixer = NULL;
@@ -284,7 +284,7 @@ static int get_amixer_rsc(struct amixer_mgr *mgr, 
static int put_amixer_rsc(struct amixer_mgr *mgr, struct amixer *amixer)

{

	unsigned long flags;

	int i = 0;

	int i;



	spin_lock_irqsave(&mgr->mgr_lock, flags);

	for (i = 0; i < amixer->rsc.msr; i++)
@@ -299,7 +299,7 @@ static int put_amixer_rsc(struct amixer_mgr *mgr, struct amixer *amixer) 


int amixer_mgr_create(void *hw, struct amixer_mgr **ramixer_mgr)

{

	int err = 0;

	int err;

	struct amixer_mgr *amixer_mgr;



	*ramixer_mgr = NULL;
@@ -367,7 +367,7 @@ static int sum_rsc_init(struct sum *sum, 
			const struct sum_desc *desc,

			struct sum_mgr *mgr)

{

	int err = 0;

	int err;



	err = rsc_init(&sum->rsc, sum->idx[0], SUM, desc->msr, mgr->mgr.hw);

	if (err)
@@ -388,9 +388,9 @@ static int get_sum_rsc(struct sum_mgr *mgr, 
		       const struct sum_desc *desc,

		       struct sum **rsum)

{

	int err = 0, i = 0;

	unsigned int idx = 0;

	struct sum *sum = NULL;

	int err, i;

	unsigned int idx;

	struct sum *sum;

	unsigned long flags;



	*rsum = NULL;
@@ -438,7 +438,7 @@ static int get_sum_rsc(struct sum_mgr *mgr, 
static int put_sum_rsc(struct sum_mgr *mgr, struct sum *sum)

{

	unsigned long flags;

	int i = 0;

	int i;



	spin_lock_irqsave(&mgr->mgr_lock, flags);

	for (i = 0; i < sum->rsc.msr; i++)
@@ -453,7 +453,7 @@ static int put_sum_rsc(struct sum_mgr *mgr, struct sum *sum) 


int sum_mgr_create(void *hw, struct sum_mgr **rsum_mgr)

{

	int err = 0;

	int err;

	struct sum_mgr *sum_mgr;



	*rsum_mgr = NULL;

sound/pci/ctxfi/ctatc.c

+84 −80
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ static unsigned int convert_format(snd_pcm_format_t snd_format) 
static unsigned int

atc_get_pitch(unsigned int input_rate, unsigned int output_rate)

{

	unsigned int pitch = 0;

	int b = 0;

	unsigned int pitch;

	int b;



	/* get pitch and convert to fixed-point 8.24 format. */

	pitch = (input_rate / output_rate) << 24;
@@ -241,12 +241,12 @@ static int atc_pcm_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm) 
	struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER];

	struct src_desc desc = {0};

	struct amixer_desc mix_dsc = {0};

	struct src *src = NULL;

	struct amixer *amixer = NULL;

	int err = 0;

	struct src *src;

	struct amixer *amixer;

	int err;

	int n_amixer = apcm->substream->runtime->channels, i = 0;

	int device = apcm->substream->pcm->device;

	unsigned int pitch = 0;

	unsigned int pitch;

	unsigned long flags;



	if (NULL != apcm->src) {
@@ -324,8 +324,8 @@ atc_pcm_release_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) 
	struct srcimp_mgr *srcimp_mgr = atc->rsc_mgrs[SRCIMP];

	struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER];

	struct sum_mgr *sum_mgr = atc->rsc_mgrs[SUM];

	struct srcimp *srcimp = NULL;

	int i = 0;

	struct srcimp *srcimp;

	int i;



	if (NULL != apcm->srcimps) {

		for (i = 0; i < apcm->n_srcimp; i++) {
@@ -377,7 +377,7 @@ atc_pcm_release_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) 


static int atc_pcm_playback_start(struct ct_atc *atc, struct ct_atc_pcm *apcm)

{

	unsigned int max_cisz = 0;

	unsigned int max_cisz;

	struct src *src = apcm->src;



	max_cisz = src->multi * src->rsc.msr;
@@ -398,8 +398,8 @@ static int atc_pcm_playback_start(struct ct_atc *atc, struct ct_atc_pcm *apcm) 


static int atc_pcm_stop(struct ct_atc *atc, struct ct_atc_pcm *apcm)

{

	struct src *src = NULL;

	int i = 0;

	struct src *src;

	int i;



	ct_timer_stop(apcm->timer);
@@ -426,8 +426,8 @@ static int 
atc_pcm_playback_position(struct ct_atc *atc, struct ct_atc_pcm *apcm)

{

	struct src *src = apcm->src;

	u32 size = 0, max_cisz = 0;

	int position = 0;

	u32 size, max_cisz;

	int position;



	position = src->ops->get_ca(src);
@@ -449,7 +449,7 @@ struct src_node_conf_t { 
static void setup_src_node_conf(struct ct_atc *atc, struct ct_atc_pcm *apcm,

				struct src_node_conf_t *conf, int *n_srcc)

{

	unsigned int pitch = 0;

	unsigned int pitch;



	/* get pitch and convert to fixed-point 8.24 format. */

	pitch = atc_get_pitch((atc->rsr * atc->msr),
@@ -494,14 +494,14 @@ atc_pcm_capture_get_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) 
	struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER];

	struct sum_mgr *sum_mgr = atc->rsc_mgrs[SUM];

	struct src_desc src_dsc = {0};

	struct src *src = NULL;

	struct src *src;

	struct srcimp_desc srcimp_dsc = {0};

	struct srcimp *srcimp = NULL;

	struct srcimp *srcimp;

	struct amixer_desc mix_dsc = {0};

	struct sum_desc sum_dsc = {0};

	unsigned int pitch = 0;

	int multi = 0, err = 0, i = 0;

	int n_srcimp = 0, n_amixer = 0, n_srcc = 0, n_sum = 0;

	unsigned int pitch;

	int multi, err, i;

	int n_srcimp, n_amixer, n_srcc, n_sum;

	struct src_node_conf_t src_node_conf[2] = {{0} };



	/* first release old resources */
@@ -518,8 +518,8 @@ atc_pcm_capture_get_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) 


	setup_src_node_conf(atc, apcm, src_node_conf, &n_srcc);

	n_sum = (1 == multi) ? 1 : 0;

	n_amixer += n_sum * 2 + n_srcc;

	n_srcimp += n_srcc;

	n_amixer = n_sum * 2 + n_srcc;

	n_srcimp = n_srcc;

	if ((multi > 1) && (0x8000000 >= pitch)) {

		/* Need extra AMIXERs and SRCIMPs for special treatment

		 * of interleaved recording of conjugate channels */
@@ -633,14 +633,14 @@ atc_pcm_capture_get_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm) 


static int atc_pcm_capture_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm)

{

	struct src *src = NULL;

	struct amixer *amixer = NULL;

	struct srcimp *srcimp = NULL;

	struct src *src;

	struct amixer *amixer;

	struct srcimp *srcimp;

	struct ct_mixer *mixer = atc->mixer;

	struct sum *mono = NULL;

	struct sum *mono;

	struct rsc *out_ports[8] = {NULL};

	int err = 0, i = 0, j = 0, n_sum = 0, multi = 0;

	unsigned int pitch = 0;

	int err, i, j, n_sum, multi;

	unsigned int pitch;

	int mix_base = 0, imp_base = 0;



	if (NULL != apcm->src) {
@@ -714,9 +714,9 @@ static int atc_pcm_capture_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm) 


static int atc_pcm_capture_start(struct ct_atc *atc, struct ct_atc_pcm *apcm)

{

	struct src *src = NULL;

	struct src *src;

	struct src_mgr *src_mgr = atc->rsc_mgrs[SRC];

	int i = 0, multi = 0;

	int i, multi;



	if (apcm->started)

		return 0;
@@ -776,10 +776,10 @@ static int spdif_passthru_playback_get_resources(struct ct_atc *atc, 
	struct amixer_mgr *amixer_mgr = atc->rsc_mgrs[AMIXER];

	struct src_desc desc = {0};

	struct amixer_desc mix_dsc = {0};

	struct src *src = NULL;

	int err = 0;

	int n_amixer = apcm->substream->runtime->channels, i = 0;

	unsigned int pitch = 0, rsr = atc->pll_rate;

	struct src *src;

	int err;

	int n_amixer = apcm->substream->runtime->channels, i;

	unsigned int pitch, rsr = atc->pll_rate;



	/* first release old resources */

	atc->pcm_release_resources(atc, apcm);
@@ -832,15 +832,24 @@ static int spdif_passthru_playback_get_resources(struct ct_atc *atc, 
	return err;

}



static int atc_pll_init(struct ct_atc *atc, int rate)

{

	struct hw *hw = atc->hw;

	int err;

	err = hw->pll_init(hw, rate);

	atc->pll_rate = err ? 0 : rate;

	return err;

}



static int

spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm)

{

	struct dao *dao = container_of(atc->daios[SPDIFOO], struct dao, daio);

	unsigned long flags;

	unsigned int rate = apcm->substream->runtime->rate;

	unsigned int status = 0;

	int err = 0;

	unsigned char iec958_con_fs = 0;

	unsigned int status;

	int err;

	unsigned char iec958_con_fs;



	switch (rate) {

	case 48000:
@@ -864,10 +873,8 @@ spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm) 
		dao->ops->set_spos(dao, status);

		dao->ops->commit_write(dao);

	}

	if ((rate != atc->pll_rate) && (32000 != rate)) {

		err = ((struct hw *)atc->hw)->pll_init(atc->hw, rate);

		atc->pll_rate = err ? 0 : rate;

	}

	if ((rate != atc->pll_rate) && (32000 != rate))

		err = atc_pll_init(atc, rate);

	spin_unlock_irqrestore(&atc->atc_lock, flags);



	return err;
@@ -876,11 +883,11 @@ spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm) 
static int

spdif_passthru_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm)

{

	struct src *src = NULL;

	struct amixer *amixer = NULL;

	struct dao *dao = NULL;

	int err = 0;

	int i = 0;

	struct src *src;

	struct amixer *amixer;

	struct dao *dao;

	int err;

	int i;

	unsigned long flags;



	if (NULL != apcm->src)
@@ -924,7 +931,7 @@ static int atc_select_line_in(struct ct_atc *atc) 
{

	struct hw *hw = atc->hw;

	struct ct_mixer *mixer = atc->mixer;

	struct src *src = NULL;

	struct src *src;



	if (hw->is_adc_source_selected(hw, ADC_LINEIN))

		return 0;
@@ -946,7 +953,7 @@ static int atc_select_mic_in(struct ct_atc *atc) 
{

	struct hw *hw = atc->hw;

	struct ct_mixer *mixer = atc->mixer;

	struct src *src = NULL;

	struct src *src;



	if (hw->is_adc_source_selected(hw, ADC_MICIN))

		return 0;
@@ -1063,8 +1070,8 @@ static int atc_spdif_out_passthru(struct ct_atc *atc, unsigned char state) 
{

	unsigned long flags;

	struct dao_desc da_dsc = {0};

	struct dao *dao = NULL;

	int err = 0;

	struct dao *dao;

	int err;

	struct ct_mixer *mixer = atc->mixer;

	struct rsc *rscs[2] = {NULL};

	unsigned int spos = 0;
@@ -1082,11 +1089,8 @@ static int atc_spdif_out_passthru(struct ct_atc *atc, unsigned char state) 
		dao->ops->set_left_input(dao, rscs[0]);

		dao->ops->set_right_input(dao, rscs[1]);

		/* Restore PLL to atc->rsr if needed. */

		if (atc->pll_rate != atc->rsr) {

			err = ((struct hw *)atc->hw)->pll_init(atc->hw,

							       atc->rsr);

			atc->pll_rate = err ? 0 : atc->rsr;

		}

		if (atc->pll_rate != atc->rsr)

			err = atc_pll_init(atc, atc->rsr);

	}

	dao->ops->set_spos(dao, spos);

	dao->ops->commit_write(dao);
@@ -1097,15 +1101,15 @@ static int atc_spdif_out_passthru(struct ct_atc *atc, unsigned char state) 


static int ct_atc_destroy(struct ct_atc *atc)

{

	struct daio_mgr *daio_mgr = NULL;

	struct dao *dao = NULL;

	struct dai *dai = NULL;

	struct daio *daio = NULL;

	struct sum_mgr *sum_mgr = NULL;

	struct src_mgr *src_mgr = NULL;

	struct srcimp_mgr *srcimp_mgr = NULL;

	struct srcimp *srcimp = NULL;

	struct ct_mixer *mixer = NULL;

	struct daio_mgr *daio_mgr;

	struct dao *dao;

	struct dai *dai;

	struct daio *daio;

	struct sum_mgr *sum_mgr;

	struct src_mgr *src_mgr;

	struct srcimp_mgr *srcimp_mgr;

	struct srcimp *srcimp;

	struct ct_mixer *mixer;

	int i = 0;



	if (NULL == atc)
@@ -1279,9 +1283,9 @@ int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc) 


static int __devinit atc_create_hw_devs(struct ct_atc *atc)

{

	struct hw *hw = NULL;

	struct hw *hw;

	struct card_conf info = {0};

	int i = 0, err = 0;

	int i, err;



	err = create_hw_obj(atc->pci, &hw);

	if (err) {
@@ -1316,14 +1320,14 @@ static int __devinit atc_create_hw_devs(struct ct_atc *atc) 
static int __devinit atc_get_resources(struct ct_atc *atc)

{

	struct daio_desc da_desc = {0};

	struct daio_mgr *daio_mgr = NULL;

	struct daio_mgr *daio_mgr;

	struct src_desc src_dsc = {0};

	struct src_mgr *src_mgr = NULL;

	struct src_mgr *src_mgr;

	struct srcimp_desc srcimp_dsc = {0};

	struct srcimp_mgr *srcimp_mgr = NULL;

	struct srcimp_mgr *srcimp_mgr;

	struct sum_desc sum_dsc = {0};

	struct sum_mgr *sum_mgr = NULL;

	int err = 0, i = 0;

	struct sum_mgr *sum_mgr;

	int err, i;

	unsigned short subsys_id;



	atc->daios = kzalloc(sizeof(void *)*(DAIONUM), GFP_KERNEL);
@@ -1428,8 +1432,8 @@ atc_connect_dai(struct src_mgr *src_mgr, struct dai *dai, 
		struct src **srcs, struct srcimp **srcimps)

{

	struct rsc *rscs[2] = {NULL};

	struct src *src = NULL;

	struct srcimp *srcimp = NULL;

	struct src *src;

	struct srcimp *srcimp;

	int i = 0;



	rscs[0] = &dai->daio.rscl;
@@ -1464,13 +1468,13 @@ atc_connect_dai(struct src_mgr *src_mgr, struct dai *dai, 


static void __devinit atc_connect_resources(struct ct_atc *atc)

{

	struct dai *dai = NULL;

	struct dao *dao = NULL;

	struct src *src = NULL;

	struct sum *sum = NULL;

	struct ct_mixer *mixer = NULL;

	struct dai *dai;

	struct dao *dao;

	struct src *src;

	struct sum *sum;

	struct ct_mixer *mixer;

	struct rsc *rscs[2] = {NULL};

	int i = 0, j = 0;

	int i, j;



	mixer = atc->mixer;
@@ -1553,11 +1557,11 @@ static struct ct_atc atc_preset __devinitdata = { 
int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,

		  unsigned int rsr, unsigned int msr, struct ct_atc **ratc)

{

	struct ct_atc *atc = NULL;

	struct ct_atc *atc;

	static struct snd_device_ops ops = {

		.dev_free = atc_dev_free,

	};

	int err = 0;

	int err;



	*ratc = NULL;

sound/pci/ctxfi/ctdaio.c

+20 −20
Original line number Diff line number Diff line
@@ -168,9 +168,9 @@ static int dao_commit_write(struct dao *dao) 


static int dao_set_left_input(struct dao *dao, struct rsc *input)

{

	struct imapper *entry = NULL;

	struct imapper *entry;

	struct daio *daio = &dao->daio;

	int i = 0;

	int i;



	entry = kzalloc((sizeof(*entry) * daio->rscl.msr), GFP_KERNEL);

	if (NULL == entry)
@@ -196,9 +196,9 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input) 


static int dao_set_right_input(struct dao *dao, struct rsc *input)

{

	struct imapper *entry = NULL;

	struct imapper *entry;

	struct daio *daio = &dao->daio;

	int i = 0;

	int i;



	entry = kzalloc((sizeof(*entry) * daio->rscr.msr), GFP_KERNEL);

	if (NULL == entry)
@@ -224,9 +224,9 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input) 


static int dao_clear_left_input(struct dao *dao)

{

	struct imapper *entry = NULL;

	struct imapper *entry;

	struct daio *daio = &dao->daio;

	int i = 0;

	int i;



	if (NULL == dao->imappers[0])

		return 0;
@@ -248,9 +248,9 @@ static int dao_clear_left_input(struct dao *dao) 


static int dao_clear_right_input(struct dao *dao)

{

	struct imapper *entry = NULL;

	struct imapper *entry;

	struct daio *daio = &dao->daio;

	int i = 0;

	int i;



	if (NULL == dao->imappers[daio->rscl.msr])

		return 0;
@@ -299,7 +299,7 @@ static int dai_set_srt_srcr(struct dai *dai, struct rsc *src) 


static int dai_set_srt_msr(struct dai *dai, unsigned int msr)

{

	unsigned int rsr = 0;

	unsigned int rsr;



	for (rsr = 0; msr > 1; msr >>= 1)

		rsr++;
@@ -340,8 +340,8 @@ static int daio_rsc_init(struct daio *daio, 
			 const struct daio_desc *desc,

			 void *hw)

{

	int err = 0;

	unsigned int idx_l = 0, idx_r = 0;

	int err;

	unsigned int idx_l, idx_r;



	switch (((struct hw *)hw)->get_chip_type(hw)) {

	case ATC20K1:
@@ -400,8 +400,8 @@ static int dao_rsc_init(struct dao *dao, 
			struct daio_mgr *mgr)

{

	struct hw *hw = mgr->mgr.hw;

	unsigned int conf = 0;

	int err = 0;

	unsigned int conf;

	int err;



	err = daio_rsc_init(&dao->daio, desc, mgr->mgr.hw);

	if (err)
@@ -423,7 +423,7 @@ static int dao_rsc_init(struct dao *dao, 
			daio_device_index(dao->daio.type, hw));

	hw->daio_mgr_commit_write(hw, mgr->mgr.ctrl_blk);



	conf |= (desc->msr & 0x7) | (desc->passthru << 3);

	conf = (desc->msr & 0x7) | (desc->passthru << 3);

	hw->daio_mgr_dao_init(mgr->mgr.ctrl_blk,

			daio_device_index(dao->daio.type, hw), conf);

	hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk,
@@ -475,9 +475,9 @@ static int dai_rsc_init(struct dai *dai, 
			const struct daio_desc *desc,

			struct daio_mgr *mgr)

{

	int err = 0;

	int err;

	struct hw *hw = mgr->mgr.hw;

	unsigned int rsr = 0, msr = 0;

	unsigned int rsr, msr;



	err = daio_rsc_init(&dai->daio, desc, mgr->mgr.hw);

	if (err)
@@ -536,7 +536,7 @@ static int get_daio_rsc(struct daio_mgr *mgr, 
			const struct daio_desc *desc,

			struct daio **rdaio)

{

	int err = 0;

	int err;

	struct dai *dai = NULL;

	struct dao *dao = NULL;

	unsigned long flags;
@@ -660,7 +660,7 @@ static int daio_map_op(void *data, struct imapper *entry) 
static int daio_imap_add(struct daio_mgr *mgr, struct imapper *entry)

{

	unsigned long flags;

	int err = 0;

	int err;



	spin_lock_irqsave(&mgr->imap_lock, flags);

	if ((0 == entry->addr) && (mgr->init_imap_added)) {
@@ -677,7 +677,7 @@ static int daio_imap_add(struct daio_mgr *mgr, struct imapper *entry) 
static int daio_imap_delete(struct daio_mgr *mgr, struct imapper *entry)

{

	unsigned long flags;

	int err = 0;

	int err;



	spin_lock_irqsave(&mgr->imap_lock, flags);

	err = input_mapper_delete(&mgr->imappers, entry, daio_map_op, mgr);
@@ -701,7 +701,7 @@ static int daio_mgr_commit_write(struct daio_mgr *mgr) 


int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr)

{

	int err = 0, i = 0;

	int err, i;

	struct daio_mgr *daio_mgr;

	struct imapper *entry;

sound/pci/ctxfi/cthardware.c

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


static enum CHIPTYP __devinitdata get_chip_type(struct hw *hw)

{

	enum CHIPTYP type = ATCNONE;

	enum CHIPTYP type;



	switch (hw->pci->device) {

	case 0x0005:	/* 20k1 device */
@@ -41,7 +41,7 @@ static enum CHIPTYP __devinitdata get_chip_type(struct hw *hw) 


int __devinit create_hw_obj(struct pci_dev *pci, struct hw **rhw)

{

	int err = 0;

	int err;



	switch (pci->device) {

	case 0x0005:	/* 20k1 device */
@@ -65,7 +65,7 @@ int __devinit create_hw_obj(struct pci_dev *pci, struct hw **rhw) 


int destroy_hw_obj(struct hw *hw)

{

	int err = 0;

	int err;



	switch (hw->pci->device) {

	case 0x0005:	/* 20k1 device */

sound/pci/ctxfi/cthw20k1.c

+41 −41
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static unsigned int src_param_pitch_mixer(unsigned int src_idx) 
static int src_commit_write(struct hw *hw, unsigned int idx, void *blk)

{

	struct src_rsc_ctrl_blk *ctl = blk;

	int i = 0;

	int i;



	if (ctl->dirty.bf.czbfs) {

		/* Clear Z-Buffer registers */
@@ -468,8 +468,8 @@ static int src_mgr_dsb_src(void *blk, unsigned int idx) 
static int src_mgr_commit_write(struct hw *hw, void *blk)

{

	struct src_mgr_ctrl_blk *ctl = blk;

	int i = 0;

	unsigned int ret = 0;

	int i;

	unsigned int ret;



	if (ctl->dirty.bf.enbsa) {

		do {
@@ -1108,7 +1108,7 @@ static int daio_mgr_set_imapaddr(void *blk, unsigned int addr) 
static int daio_mgr_commit_write(struct hw *hw, void *blk)

{

	struct daio_mgr_ctrl_blk *ctl = blk;

	int i = 0;

	int i;



	if (ctl->dirty.bf.i2sictl || ctl->dirty.bf.i2soctl) {

		for (i = 0; i < 4; i++) {
@@ -1212,8 +1212,8 @@ struct trn_conf { 


static int hw_daio_init(struct hw *hw, const struct daio_conf *info)

{

	u32 i2sorg = 0;

	u32 spdorg = 0;

	u32 i2sorg;

	u32 spdorg;



	/* Read I2S CTL.  Keep original value. */

	/*i2sorg = hw_read_20kx(hw, I2SCTL);*/
@@ -1263,8 +1263,8 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info) 
/* TRANSPORT operations */

static int hw_trn_init(struct hw *hw, const struct trn_conf *info)

{

	u32 trnctl = 0;

	unsigned long ptp_phys_low = 0, ptp_phys_high = 0;

	u32 trnctl;

	u32 ptp_phys_low, ptp_phys_high;



	/* Set up device page table */

	if ((~0UL) == info->vm_pgt_phys) {
@@ -1316,7 +1316,7 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info) 
static int hw_pll_init(struct hw *hw, unsigned int rsr)

{

	unsigned int pllctl;

	int i = 0;

	int i;



	pllctl = (48000 == rsr) ? 0x1480a001 : 0x1480a731;

	for (i = 0; i < 3; i++) {
@@ -1384,7 +1384,7 @@ static void i2c_lock(struct hw *hw) 


static void i2c_write(struct hw *hw, u32 device, u32 addr, u32 data)

{

	unsigned int ret = 0;

	unsigned int ret;



	do {

		ret = hw_read_pci(hw, 0xEC);
@@ -1397,9 +1397,9 @@ static void i2c_write(struct hw *hw, u32 device, u32 addr, u32 data) 


static int hw_reset_dac(struct hw *hw)

{

	u32 i = 0;

	u16 gpioorg = 0;

	unsigned int ret = 0;

	u32 i;

	u16 gpioorg;

	unsigned int ret;



	if (i2c_unlock(hw))

		return -1;
@@ -1430,10 +1430,10 @@ static int hw_reset_dac(struct hw *hw) 


static int hw_dac_init(struct hw *hw, const struct dac_conf *info)

{

	u32 data = 0;

	u16 gpioorg = 0;

	u16 subsys_id = 0;

	unsigned int ret = 0;

	u32 data;

	u16 gpioorg;

	u16 subsys_id;

	unsigned int ret;



	pci_read_config_word(hw->pci, PCI_SUBSYSTEM_ID, &subsys_id);

	if ((subsys_id == 0x0022) || (subsys_id == 0x002F)) {
@@ -1494,13 +1494,12 @@ static int hw_dac_init(struct hw *hw, const struct dac_conf *info) 


static int is_adc_input_selected_SB055x(struct hw *hw, enum ADCSRC type)

{

	u32 data = 0;

	return data;

	return 0;

}



static int is_adc_input_selected_SBx(struct hw *hw, enum ADCSRC type)

{

	u32 data = 0;

	u32 data;



	data = hw_read_20kx(hw, GPIO);

	switch (type) {
@@ -1521,7 +1520,7 @@ static int is_adc_input_selected_SBx(struct hw *hw, enum ADCSRC type) 


static int is_adc_input_selected_hendrix(struct hw *hw, enum ADCSRC type)

{

	u32 data = 0;

	u32 data;



	data = hw_read_20kx(hw, GPIO);

	switch (type) {
@@ -1539,7 +1538,7 @@ static int is_adc_input_selected_hendrix(struct hw *hw, enum ADCSRC type) 


static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type)

{

	u16 subsys_id = 0;

	u16 subsys_id;



	pci_read_config_word(hw->pci, PCI_SUBSYSTEM_ID, &subsys_id);

	if ((subsys_id == 0x0022) || (subsys_id == 0x002F)) {
@@ -1559,7 +1558,7 @@ static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type) 
static int

adc_input_select_SB055x(struct hw *hw, enum ADCSRC type, unsigned char boost)

{

	u32 data = 0;

	u32 data;



	/*

	 * check and set the following GPIO bits accordingly
@@ -1599,9 +1598,9 @@ adc_input_select_SB055x(struct hw *hw, enum ADCSRC type, unsigned char boost) 
static int

adc_input_select_SBx(struct hw *hw, enum ADCSRC type, unsigned char boost)

{

	u32 data = 0;

	u32 i2c_data = 0;

	unsigned int ret = 0;

	u32 data;

	u32 i2c_data;

	unsigned int ret;



	if (i2c_unlock(hw))

		return -1;
@@ -1649,9 +1648,9 @@ adc_input_select_SBx(struct hw *hw, enum ADCSRC type, unsigned char boost) 
static int

adc_input_select_hendrix(struct hw *hw, enum ADCSRC type, unsigned char boost)

{

	u32 data = 0;

	u32 i2c_data = 0;

	unsigned int ret = 0;

	u32 data;

	u32 i2c_data;

	unsigned int ret;



	if (i2c_unlock(hw))

		return -1;
@@ -1693,7 +1692,7 @@ adc_input_select_hendrix(struct hw *hw, enum ADCSRC type, unsigned char boost) 


static int hw_adc_input_select(struct hw *hw, enum ADCSRC type)

{

	u16 subsys_id = 0;

	u16 subsys_id;



	pci_read_config_word(hw->pci, PCI_SUBSYSTEM_ID, &subsys_id);

	if ((subsys_id == 0x0022) || (subsys_id == 0x002F)) {
@@ -1719,8 +1718,8 @@ static int adc_init_SBx(struct hw *hw, int input, int mic20db) 
{

	u16 gpioorg;

	u16 input_source;

	u32 adcdata = 0;

	unsigned int ret = 0;

	u32 adcdata;

	unsigned int ret;



	input_source = 0x100;  /* default to analog */

	switch (input) {
@@ -1742,6 +1741,7 @@ static int adc_init_SBx(struct hw *hw, int input, int mic20db) 
		input_source = 0x0;  /* set to Digital */

		break;

	default:

		adcdata = 0x0;

		break;

	}
@@ -1781,8 +1781,8 @@ static int adc_init_SBx(struct hw *hw, int input, int mic20db) 


static int hw_adc_init(struct hw *hw, const struct adc_conf *info)

{

	int err = 0;

	u16 subsys_id = 0;

	int err;

	u16 subsys_id;



	pci_read_config_word(hw->pci, PCI_SUBSYSTEM_ID, &subsys_id);

	if ((subsys_id == 0x0022) || (subsys_id == 0x002F)) {
@@ -1797,7 +1797,7 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) 


static int hw_have_digit_io_switch(struct hw *hw)

{

	u16 subsys_id = 0;

	u16 subsys_id;



	pci_read_config_word(hw->pci, PCI_SUBSYSTEM_ID, &subsys_id);

	/* SB073x and Vista compatible cards have no digit IO switch */
@@ -1814,11 +1814,11 @@ static int uaa_to_xfi(struct pci_dev *pci) 
{

	unsigned int bar0, bar1, bar2, bar3, bar4, bar5;

	unsigned int cmd, irq, cl_size, l_timer, pwr;

	unsigned int is_uaa = 0;

	unsigned int is_uaa;

	unsigned int data[4] = {0};

	unsigned int io_base;

	void *mem_base;

	int i = 0;

	int i;

	const u32 CTLX = CTLBITS('C', 'T', 'L', 'X');

	const u32 CTL_ = CTLBITS('C', 'T', 'L', '-');

	const u32 CTLF = CTLBITS('C', 'T', 'L', 'F');
@@ -1916,9 +1916,9 @@ static irqreturn_t ct_20k1_interrupt(int irq, void *dev_id) 


static int hw_card_start(struct hw *hw)

{

	int err = 0;

	int err;

	struct pci_dev *pci = hw->pci;

	u16 subsys_id = 0;

	u16 subsys_id;



	err = pci_enable_device(pci);

	if (err < 0)
@@ -2004,8 +2004,8 @@ static int hw_card_init(struct hw *hw, struct card_conf *info) 
{

	int err;

	unsigned int gctl;

	u16 subsys_id = 0;

	u32 data = 0;

	u16 subsys_id;

	u32 data;

	struct dac_conf dac_info = {0};

	struct adc_conf adc_info = {0};

	struct daio_conf daio_info = {0};