aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712/ice1712.c
diff options
context:
space:
mode:
authorSudip Mukherjee <sudip@vectorindia.org>2014-11-14 05:39:05 -0500
committerTakashi Iwai <tiwai@suse.de>2014-11-14 08:16:36 -0500
commit387417b56295ef93d7cb38e1721826c85dfe897c (patch)
treef3f01a70e02e6fc5447dfbd299e681f4dc17dc83 /sound/pci/ice1712/ice1712.c
parent9547c0999e50fd624cab52f94a79f0fd27a7cb84 (diff)
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>
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
-rw-r--r--sound/pci/ice1712/ice1712.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 48a0c330da24..597533490f2d 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -1295,10 +1295,7 @@ static int snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device, struct snd
1295 return err; 1295 return err;
1296 } 1296 }
1297 1297
1298 err = snd_ice1712_build_pro_mixer(ice); 1298 return snd_ice1712_build_pro_mixer(ice);
1299 if (err < 0)
1300 return err;
1301 return 0;
1302} 1299}
1303 1300
1304/* 1301/*
@@ -1545,10 +1542,9 @@ static int snd_ice1712_ac97_mixer(struct snd_ice1712 *ice)
1545 dev_warn(ice->card->dev, 1542 dev_warn(ice->card->dev,
1546 "cannot initialize ac97 for consumer, skipped\n"); 1543 "cannot initialize ac97 for consumer, skipped\n");
1547 else { 1544 else {
1548 err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97, ice)); 1545 return snd_ctl_add(ice->card,
1549 if (err < 0) 1546 snd_ctl_new1(&snd_ice1712_mixer_digmix_route_ac97,
1550 return err; 1547 ice));
1551 return 0;
1552 } 1548 }
1553 } 1549 }
1554 1550
@@ -2497,11 +2493,8 @@ static int snd_ice1712_build_controls(struct snd_ice1712 *ice)
2497 err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_pro_volume_rate, ice)); 2493 err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_pro_volume_rate, ice));
2498 if (err < 0) 2494 if (err < 0)
2499 return err; 2495 return err;
2500 err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_ice1712_mixer_pro_peak, ice)); 2496 return snd_ctl_add(ice->card,
2501 if (err < 0) 2497 snd_ctl_new1(&snd_ice1712_mixer_pro_peak, ice));
2502 return err;
2503
2504 return 0;
2505} 2498}
2506 2499
2507static int snd_ice1712_free(struct snd_ice1712 *ice) 2500static int snd_ice1712_free(struct snd_ice1712 *ice)