diff options
Diffstat (limited to 'sound/soc/codecs/alc5623.c')
-rw-r--r-- | sound/soc/codecs/alc5623.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c index 3feee569ceea..d47b62ddb210 100644 --- a/sound/soc/codecs/alc5623.c +++ b/sound/soc/codecs/alc5623.c | |||
@@ -925,22 +925,22 @@ static int alc5623_probe(struct snd_soc_codec *codec) | |||
925 | 925 | ||
926 | switch (alc5623->id) { | 926 | switch (alc5623->id) { |
927 | case 0x21: | 927 | case 0x21: |
928 | snd_soc_add_controls(codec, alc5621_vol_snd_controls, | 928 | snd_soc_add_codec_controls(codec, alc5621_vol_snd_controls, |
929 | ARRAY_SIZE(alc5621_vol_snd_controls)); | 929 | ARRAY_SIZE(alc5621_vol_snd_controls)); |
930 | break; | 930 | break; |
931 | case 0x22: | 931 | case 0x22: |
932 | snd_soc_add_controls(codec, alc5622_vol_snd_controls, | 932 | snd_soc_add_codec_controls(codec, alc5622_vol_snd_controls, |
933 | ARRAY_SIZE(alc5622_vol_snd_controls)); | 933 | ARRAY_SIZE(alc5622_vol_snd_controls)); |
934 | break; | 934 | break; |
935 | case 0x23: | 935 | case 0x23: |
936 | snd_soc_add_controls(codec, alc5623_vol_snd_controls, | 936 | snd_soc_add_codec_controls(codec, alc5623_vol_snd_controls, |
937 | ARRAY_SIZE(alc5623_vol_snd_controls)); | 937 | ARRAY_SIZE(alc5623_vol_snd_controls)); |
938 | break; | 938 | break; |
939 | default: | 939 | default: |
940 | return -EINVAL; | 940 | return -EINVAL; |
941 | } | 941 | } |
942 | 942 | ||
943 | snd_soc_add_controls(codec, alc5623_snd_controls, | 943 | snd_soc_add_codec_controls(codec, alc5623_snd_controls, |
944 | ARRAY_SIZE(alc5623_snd_controls)); | 944 | ARRAY_SIZE(alc5623_snd_controls)); |
945 | 945 | ||
946 | snd_soc_dapm_new_controls(dapm, alc5623_dapm_widgets, | 946 | snd_soc_dapm_new_controls(dapm, alc5623_dapm_widgets, |
@@ -992,7 +992,7 @@ static struct snd_soc_codec_driver soc_codec_device_alc5623 = { | |||
992 | * low = 0x1a | 992 | * low = 0x1a |
993 | * high = 0x1b | 993 | * high = 0x1b |
994 | */ | 994 | */ |
995 | static int alc5623_i2c_probe(struct i2c_client *client, | 995 | static __devinit int alc5623_i2c_probe(struct i2c_client *client, |
996 | const struct i2c_device_id *id) | 996 | const struct i2c_device_id *id) |
997 | { | 997 | { |
998 | struct alc5623_platform_data *pdata; | 998 | struct alc5623_platform_data *pdata; |
@@ -1059,7 +1059,7 @@ static int alc5623_i2c_probe(struct i2c_client *client, | |||
1059 | return ret; | 1059 | return ret; |
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | static int alc5623_i2c_remove(struct i2c_client *client) | 1062 | static __devexit int alc5623_i2c_remove(struct i2c_client *client) |
1063 | { | 1063 | { |
1064 | snd_soc_unregister_codec(&client->dev); | 1064 | snd_soc_unregister_codec(&client->dev); |
1065 | return 0; | 1065 | return 0; |