diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-12-10 03:00:45 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-10 03:00:45 -0500 |
commit | 97768a8e658605a905ba0d908d1b23b475170bed (patch) | |
tree | 0431dd9a118c138d164c263033a53502e4c01586 /sound/soc/codecs/wm8983.c | |
parent | 9621055fbbb190264cb6a8182b70e3f0f917d770 (diff) | |
parent | 7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff) |
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8
Some incremental updates, nothing too exciting. The biggest block here
is the __dev annotation removal stuff from Bill, everything else is the
usual driver-specific stuff - a combination of fixes and development.
There will be at least more more set of fixes to come but I wanted to
get these out ready for the merge window to make sure Bill's stuff makes
it in.
Diffstat (limited to 'sound/soc/codecs/wm8983.c')
-rw-r--r-- | sound/soc/codecs/wm8983.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c index d8879f262d27..9fe1e041da49 100644 --- a/sound/soc/codecs/wm8983.c +++ b/sound/soc/codecs/wm8983.c | |||
@@ -1087,7 +1087,7 @@ static const struct regmap_config wm8983_regmap = { | |||
1087 | }; | 1087 | }; |
1088 | 1088 | ||
1089 | #if defined(CONFIG_SPI_MASTER) | 1089 | #if defined(CONFIG_SPI_MASTER) |
1090 | static int __devinit wm8983_spi_probe(struct spi_device *spi) | 1090 | static int wm8983_spi_probe(struct spi_device *spi) |
1091 | { | 1091 | { |
1092 | struct wm8983_priv *wm8983; | 1092 | struct wm8983_priv *wm8983; |
1093 | int ret; | 1093 | int ret; |
@@ -1110,7 +1110,7 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi) | |||
1110 | return ret; | 1110 | return ret; |
1111 | } | 1111 | } |
1112 | 1112 | ||
1113 | static int __devexit wm8983_spi_remove(struct spi_device *spi) | 1113 | static int wm8983_spi_remove(struct spi_device *spi) |
1114 | { | 1114 | { |
1115 | snd_soc_unregister_codec(&spi->dev); | 1115 | snd_soc_unregister_codec(&spi->dev); |
1116 | return 0; | 1116 | return 0; |
@@ -1122,13 +1122,13 @@ static struct spi_driver wm8983_spi_driver = { | |||
1122 | .owner = THIS_MODULE, | 1122 | .owner = THIS_MODULE, |
1123 | }, | 1123 | }, |
1124 | .probe = wm8983_spi_probe, | 1124 | .probe = wm8983_spi_probe, |
1125 | .remove = __devexit_p(wm8983_spi_remove) | 1125 | .remove = wm8983_spi_remove |
1126 | }; | 1126 | }; |
1127 | #endif | 1127 | #endif |
1128 | 1128 | ||
1129 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 1129 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
1130 | static __devinit int wm8983_i2c_probe(struct i2c_client *i2c, | 1130 | static int wm8983_i2c_probe(struct i2c_client *i2c, |
1131 | const struct i2c_device_id *id) | 1131 | const struct i2c_device_id *id) |
1132 | { | 1132 | { |
1133 | struct wm8983_priv *wm8983; | 1133 | struct wm8983_priv *wm8983; |
1134 | int ret; | 1134 | int ret; |
@@ -1152,7 +1152,7 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c, | |||
1152 | return ret; | 1152 | return ret; |
1153 | } | 1153 | } |
1154 | 1154 | ||
1155 | static __devexit int wm8983_i2c_remove(struct i2c_client *client) | 1155 | static int wm8983_i2c_remove(struct i2c_client *client) |
1156 | { | 1156 | { |
1157 | snd_soc_unregister_codec(&client->dev); | 1157 | snd_soc_unregister_codec(&client->dev); |
1158 | return 0; | 1158 | return 0; |
@@ -1170,7 +1170,7 @@ static struct i2c_driver wm8983_i2c_driver = { | |||
1170 | .owner = THIS_MODULE, | 1170 | .owner = THIS_MODULE, |
1171 | }, | 1171 | }, |
1172 | .probe = wm8983_i2c_probe, | 1172 | .probe = wm8983_i2c_probe, |
1173 | .remove = __devexit_p(wm8983_i2c_remove), | 1173 | .remove = wm8983_i2c_remove, |
1174 | .id_table = wm8983_i2c_id | 1174 | .id_table = wm8983_i2c_id |
1175 | }; | 1175 | }; |
1176 | #endif | 1176 | #endif |