ALSA: ice1712: remove unneeded return statement
the functions: snd_ice1712_akm4xxx_build_controls snd_ice1712_build_pro_mixer snd_ctl_add snd_ak4114_build prodigy192_ak4114_init snd_ak4113_build are all returning either 0 or a negetive error value. so we can easily remove the check for a negative value and return the value instead. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
9547c0999e
commit
387417b562
|
@ -309,11 +309,7 @@ static int snd_ice1712_value_init(struct snd_ice1712 *ice)
|
|||
return err;
|
||||
|
||||
/* ak4524 controls */
|
||||
err = snd_ice1712_akm4xxx_build_controls(ice);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return 0;
|
||||
return snd_ice1712_akm4xxx_build_controls(ice);
|
||||
}
|
||||
|
||||
static int snd_ice1712_ez8_init(struct snd_ice1712 *ice)
|
||||
|
|
|
@ -1295,10 +1295,7 @@ static int snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device, struct snd
|
|||
return err;
|
||||
}
|
||||
|
||||
err = snd_ice1712_build_pro_mixer(ice);
|
||||
if (err < 0)
|
||||
return err;
|
||||
return 0;
|
||||
return snd_ice1712_build_pro_mixer(ice);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1545,10 +1542,9 @@ static int snd_ice1712_ac97_mixer(struct snd_ice1712 *ice)
|
|||
dev_warn(ice->card->dev,
|
||||
"cannot initialize ac97 for consumer, skipped\n");
|
||||
else {
|
||||
err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97, ice));
|
||||
if (err < 0)
|
||||
return err;
|
||||
return 0;
|
||||
return snd_ctl_add(ice->card,
|
||||
snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97,
|
||||
ice));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2497,11 +2493,8 @@ static int snd_ice1712_build_controls(struct snd_ice1712 *ice)
|
|||
err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_pro_volume_rate, ice));
|
||||
if (err < 0)
|
||||
return err;
|
||||
err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_pro_peak, ice));
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return 0;
|
||||
return snd_ctl_add(ice->card,
|
||||
snd_ctl_new1(&snd_ice1712_mixer_pro_peak, ice));
|
||||
}
|
||||
|
||||
static int snd_ice1712_free(struct snd_ice1712 *ice)
|
||||
|
|
|
@ -2497,11 +2497,8 @@ static int snd_vt1724_build_controls(struct snd_ice1712 *ice)
|
|||
return err;
|
||||
}
|
||||
|
||||
err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_vt1724_mixer_pro_peak, ice));
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return 0;
|
||||
return snd_ctl_add(ice->card,
|
||||
snd_ctl_new1(&snd_vt1724_mixer_pro_peak, ice));
|
||||
}
|
||||
|
||||
static int snd_vt1724_free(struct snd_ice1712 *ice)
|
||||
|
|
|
@ -475,11 +475,8 @@ static int juli_add_controls(struct snd_ice1712 *ice)
|
|||
return err;
|
||||
|
||||
/* only capture SPDIF over AK4114 */
|
||||
err = snd_ak4114_build(spec->ak4114, NULL,
|
||||
return snd_ak4114_build(spec->ak4114, NULL,
|
||||
ice->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream);
|
||||
if (err < 0)
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -758,10 +758,8 @@ static int prodigy192_init(struct snd_ice1712 *ice)
|
|||
"AK4114 initialized with status %d\n", err);
|
||||
} else
|
||||
dev_dbg(ice->card->dev, "AK4114 not found\n");
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return 0;
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -833,11 +833,8 @@ static int qtet_add_controls(struct snd_ice1712 *ice)
|
|||
if (err < 0)
|
||||
return err;
|
||||
/* only capture SPDIF over AK4113 */
|
||||
err = snd_ak4113_build(spec->ak4113,
|
||||
return snd_ak4113_build(spec->ak4113,
|
||||
ice->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream);
|
||||
if (err < 0)
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int qtet_is_spdif_master(struct snd_ice1712 *ice)
|
||||
|
|
Loading…
Reference in a new issue