Commit 4bd3a1f4 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Fix inconsistent meaning of default case while checking alc5623->id

In alc5623_i2c_probe(),
the default case for checking alc5623->id behaves the same as case 0x23.
However, In alc5623_probe() the default case for checking alc5623->id
becomes to be the same as case 0x21.
This makes the meaning of default case inconsistent.

Since we have checked codec id in alc5623_i2c_probe() by comparing
vid2 with id->driver_data, it is not possible to run into the default case now.

In case we may add more supported devices to alc5623_i2c_table in the future,
this patch changes the default case return -EINVAL to let people know that
they should not run into this case. They should also add a new case accordingly
for the new id.
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 43fa95ca
...@@ -925,7 +925,6 @@ static int alc5623_probe(struct snd_soc_codec *codec) ...@@ -925,7 +925,6 @@ static int alc5623_probe(struct snd_soc_codec *codec)
} }
switch (alc5623->id) { switch (alc5623->id) {
default:
case 0x21: case 0x21:
snd_soc_add_controls(codec, rt5621_vol_snd_controls, snd_soc_add_controls(codec, rt5621_vol_snd_controls,
ARRAY_SIZE(rt5621_vol_snd_controls)); ARRAY_SIZE(rt5621_vol_snd_controls));
...@@ -938,6 +937,8 @@ static int alc5623_probe(struct snd_soc_codec *codec) ...@@ -938,6 +937,8 @@ static int alc5623_probe(struct snd_soc_codec *codec)
snd_soc_add_controls(codec, alc5623_vol_snd_controls, snd_soc_add_controls(codec, alc5623_vol_snd_controls,
ARRAY_SIZE(alc5623_vol_snd_controls)); ARRAY_SIZE(alc5623_vol_snd_controls));
break; break;
default:
return -EINVAL;
} }
snd_soc_add_controls(codec, alc5623_snd_controls, snd_soc_add_controls(codec, alc5623_snd_controls,
...@@ -950,7 +951,6 @@ static int alc5623_probe(struct snd_soc_codec *codec) ...@@ -950,7 +951,6 @@ static int alc5623_probe(struct snd_soc_codec *codec)
snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
switch (alc5623->id) { switch (alc5623->id) {
default:
case 0x21: case 0x21:
case 0x22: case 0x22:
snd_soc_dapm_new_controls(dapm, alc5623_dapm_amp_widgets, snd_soc_dapm_new_controls(dapm, alc5623_dapm_amp_widgets,
...@@ -962,6 +962,8 @@ static int alc5623_probe(struct snd_soc_codec *codec) ...@@ -962,6 +962,8 @@ static int alc5623_probe(struct snd_soc_codec *codec)
snd_soc_dapm_add_routes(dapm, intercon_spk, snd_soc_dapm_add_routes(dapm, intercon_spk,
ARRAY_SIZE(intercon_spk)); ARRAY_SIZE(intercon_spk));
break; break;
default:
return -EINVAL;
} }
return ret; return ret;
...@@ -1039,10 +1041,12 @@ static int alc5623_i2c_probe(struct i2c_client *client, ...@@ -1039,10 +1041,12 @@ static int alc5623_i2c_probe(struct i2c_client *client,
case 0x22: case 0x22:
alc5623_dai.name = "alc5622-hifi"; alc5623_dai.name = "alc5622-hifi";
break; break;
default:
case 0x23: case 0x23:
alc5623_dai.name = "alc5623-hifi"; alc5623_dai.name = "alc5623-hifi";
break; break;
default:
kfree(alc5623);
return -EINVAL;
} }
i2c_set_clientdata(client, alc5623); i2c_set_clientdata(client, alc5623);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment