ASoC: sigmadsp: fix simple_return.cocci warnings
Author: kbuild test robot <fengguang.wu@intel.com>
sound/soc/codecs/sigmadsp.c:656:1-4: WARNING: end returns can be simpified and declaration on line 636 can be dropped
Simplify a trivial if-return sequence. Possibly combine with a
preceding function call.
Generated by: scripts/coccinelle/misc/simple_return.cocci
Signed-off-by: Fengguang Wu
Signed-off-by: Mark Brown
---
sound/soc/codecs/sigmadsp.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sound/soc/codecs/sigmadsp.c b/sound/soc/codecs/sigmadsp.c
index 6abefd2..34fdc40 100644
--- a/sound/soc/codecs/sigmadsp.c
+++ b/sound/soc/codecs/sigmadsp.c
@@ -633,7 +633,6 @@ static int sigmadsp_alloc_control(struct sigmadsp *sigmadsp,
{
struct snd_kcontrol_new template;
struct snd_kcontrol *kcontrol;
- int ret;
memset(&template, 0, sizeof(template));
template.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -653,11 +652,7 @@ static int sigmadsp_alloc_control(struct sigmadsp *sigmadsp,
kcontrol->private_free = sigmadsp_control_free;
ctrl->kcontrol = kcontrol;
- ret = snd_ctl_add(sigmadsp->component->card->snd_card, kcontrol);
- if (ret)
- return ret;
-
- return 0;
+ return snd_ctl_add(sigmadsp->component->card->snd_card, kcontrol);
}
static void sigmadsp_activate_ctrl(struct sigmadsp *sigmadsp, |
---
sound/soc/codecs/sigmadsp.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sound/soc/codecs/sigmadsp.c b/sound/soc/codecs/sigmadsp.c
index 6abefd2..34fdc40 100644
--- a/sound/soc/codecs/sigmadsp.c
+++ b/sound/soc/codecs/sigmadsp.c
@@ -633,7 +633,6 @@ static int sigmadsp_alloc_control(struct sigmadsp *sigmadsp,
{
struct snd_kcontrol_new template;
struct snd_kcontrol *kcontrol;
- int ret;
memset(&template, 0, sizeof(template));
template.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -653,11 +652,7 @@ static int sigmadsp_alloc_control(struct sigmadsp *sigmadsp,
kcontrol->private_free = sigmadsp_control_free;
ctrl->kcontrol = kcontrol;
- ret = snd_ctl_add(sigmadsp->component->card->snd_card, kcontrol);
- if (ret)
- return ret;
-
- return 0;
+ return snd_ctl_add(sigmadsp->component->card->snd_card, kcontrol);
}
static void sigmadsp_activate_ctrl(struct sigmadsp *sigmadsp,