diff options
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
-rw-r--r-- | sound/soc/codecs/wm8955.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 7a82b7d28dcd..82c8ba975720 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c | |||
@@ -1012,8 +1012,8 @@ static const struct regmap_config wm8955_regmap = { | |||
1012 | .num_reg_defaults = ARRAY_SIZE(wm8955_reg_defaults), | 1012 | .num_reg_defaults = ARRAY_SIZE(wm8955_reg_defaults), |
1013 | }; | 1013 | }; |
1014 | 1014 | ||
1015 | static __devinit int wm8955_i2c_probe(struct i2c_client *i2c, | 1015 | static int wm8955_i2c_probe(struct i2c_client *i2c, |
1016 | const struct i2c_device_id *id) | 1016 | const struct i2c_device_id *id) |
1017 | { | 1017 | { |
1018 | struct wm8955_priv *wm8955; | 1018 | struct wm8955_priv *wm8955; |
1019 | int ret; | 1019 | int ret; |
@@ -1039,7 +1039,7 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c, | |||
1039 | return ret; | 1039 | return ret; |
1040 | } | 1040 | } |
1041 | 1041 | ||
1042 | static __devexit int wm8955_i2c_remove(struct i2c_client *client) | 1042 | static int wm8955_i2c_remove(struct i2c_client *client) |
1043 | { | 1043 | { |
1044 | snd_soc_unregister_codec(&client->dev); | 1044 | snd_soc_unregister_codec(&client->dev); |
1045 | 1045 | ||
@@ -1058,7 +1058,7 @@ static struct i2c_driver wm8955_i2c_driver = { | |||
1058 | .owner = THIS_MODULE, | 1058 | .owner = THIS_MODULE, |
1059 | }, | 1059 | }, |
1060 | .probe = wm8955_i2c_probe, | 1060 | .probe = wm8955_i2c_probe, |
1061 | .remove = __devexit_p(wm8955_i2c_remove), | 1061 | .remove = wm8955_i2c_remove, |
1062 | .id_table = wm8955_i2c_id, | 1062 | .id_table = wm8955_i2c_id, |
1063 | }; | 1063 | }; |
1064 | 1064 | ||