diff options
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
-rw-r--r-- | sound/soc/codecs/wm8960.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index cf09cb625a7b..9bb927325993 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
@@ -1028,8 +1028,8 @@ static const struct regmap_config wm8960_regmap = { | |||
1028 | .volatile_reg = wm8960_volatile, | 1028 | .volatile_reg = wm8960_volatile, |
1029 | }; | 1029 | }; |
1030 | 1030 | ||
1031 | static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, | 1031 | static int wm8960_i2c_probe(struct i2c_client *i2c, |
1032 | const struct i2c_device_id *id) | 1032 | const struct i2c_device_id *id) |
1033 | { | 1033 | { |
1034 | struct wm8960_data *pdata = dev_get_platdata(&i2c->dev); | 1034 | struct wm8960_data *pdata = dev_get_platdata(&i2c->dev); |
1035 | struct wm8960_priv *wm8960; | 1035 | struct wm8960_priv *wm8960; |
@@ -1062,7 +1062,7 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, | |||
1062 | return ret; | 1062 | return ret; |
1063 | } | 1063 | } |
1064 | 1064 | ||
1065 | static __devexit int wm8960_i2c_remove(struct i2c_client *client) | 1065 | static int wm8960_i2c_remove(struct i2c_client *client) |
1066 | { | 1066 | { |
1067 | snd_soc_unregister_codec(&client->dev); | 1067 | snd_soc_unregister_codec(&client->dev); |
1068 | return 0; | 1068 | return 0; |
@@ -1080,7 +1080,7 @@ static struct i2c_driver wm8960_i2c_driver = { | |||
1080 | .owner = THIS_MODULE, | 1080 | .owner = THIS_MODULE, |
1081 | }, | 1081 | }, |
1082 | .probe = wm8960_i2c_probe, | 1082 | .probe = wm8960_i2c_probe, |
1083 | .remove = __devexit_p(wm8960_i2c_remove), | 1083 | .remove = wm8960_i2c_remove, |
1084 | .id_table = wm8960_i2c_id, | 1084 | .id_table = wm8960_i2c_id, |
1085 | }; | 1085 | }; |
1086 | 1086 | ||