aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8961.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8961.c')
-rw-r--r--sound/soc/codecs/wm8961.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index f387670d0d75..900328e28a15 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -937,8 +937,8 @@ static const struct regmap_config wm8961_regmap = {
937 .readable_reg = wm8961_readable, 937 .readable_reg = wm8961_readable,
938}; 938};
939 939
940static __devinit int wm8961_i2c_probe(struct i2c_client *i2c, 940static int wm8961_i2c_probe(struct i2c_client *i2c,
941 const struct i2c_device_id *id) 941 const struct i2c_device_id *id)
942{ 942{
943 struct wm8961_priv *wm8961; 943 struct wm8961_priv *wm8961;
944 unsigned int val; 944 unsigned int val;
@@ -993,7 +993,7 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
993 return ret; 993 return ret;
994} 994}
995 995
996static __devexit int wm8961_i2c_remove(struct i2c_client *client) 996static int wm8961_i2c_remove(struct i2c_client *client)
997{ 997{
998 snd_soc_unregister_codec(&client->dev); 998 snd_soc_unregister_codec(&client->dev);
999 999
@@ -1012,7 +1012,7 @@ static struct i2c_driver wm8961_i2c_driver = {
1012 .owner = THIS_MODULE, 1012 .owner = THIS_MODULE,
1013 }, 1013 },
1014 .probe = wm8961_i2c_probe, 1014 .probe = wm8961_i2c_probe,
1015 .remove = __devexit_p(wm8961_i2c_remove), 1015 .remove = wm8961_i2c_remove,
1016 .id_table = wm8961_i2c_id, 1016 .id_table = wm8961_i2c_id,
1017}; 1017};
1018 1018