diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-07 09:26:37 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:31:51 -0500 |
commit | 7a79e94e973639da7bf1b8242d504f9db9e5e848 (patch) | |
tree | 2bae8c8a5e1b350e2df0dbd6a80eff2dcc943ee1 /sound/soc/codecs/wm8728.c | |
parent | e51e97eecdb2a4415aac5f1a69aa66ed787f1217 (diff) |
ASoC: codecs: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.
Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8728.c')
-rw-r--r-- | sound/soc/codecs/wm8728.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 00a12a0c3919..c6a292dcded0 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c | |||
@@ -280,7 +280,7 @@ static const struct regmap_config wm8728_regmap = { | |||
280 | }; | 280 | }; |
281 | 281 | ||
282 | #if defined(CONFIG_SPI_MASTER) | 282 | #if defined(CONFIG_SPI_MASTER) |
283 | static int __devinit wm8728_spi_probe(struct spi_device *spi) | 283 | static int wm8728_spi_probe(struct spi_device *spi) |
284 | { | 284 | { |
285 | struct wm8728_priv *wm8728; | 285 | struct wm8728_priv *wm8728; |
286 | int ret; | 286 | int ret; |
@@ -302,7 +302,7 @@ static int __devinit wm8728_spi_probe(struct spi_device *spi) | |||
302 | return ret; | 302 | return ret; |
303 | } | 303 | } |
304 | 304 | ||
305 | static int __devexit wm8728_spi_remove(struct spi_device *spi) | 305 | static int wm8728_spi_remove(struct spi_device *spi) |
306 | { | 306 | { |
307 | snd_soc_unregister_codec(&spi->dev); | 307 | snd_soc_unregister_codec(&spi->dev); |
308 | 308 | ||
@@ -316,13 +316,13 @@ static struct spi_driver wm8728_spi_driver = { | |||
316 | .of_match_table = wm8728_of_match, | 316 | .of_match_table = wm8728_of_match, |
317 | }, | 317 | }, |
318 | .probe = wm8728_spi_probe, | 318 | .probe = wm8728_spi_probe, |
319 | .remove = __devexit_p(wm8728_spi_remove), | 319 | .remove = wm8728_spi_remove, |
320 | }; | 320 | }; |
321 | #endif /* CONFIG_SPI_MASTER */ | 321 | #endif /* CONFIG_SPI_MASTER */ |
322 | 322 | ||
323 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 323 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
324 | static __devinit int wm8728_i2c_probe(struct i2c_client *i2c, | 324 | static int wm8728_i2c_probe(struct i2c_client *i2c, |
325 | const struct i2c_device_id *id) | 325 | const struct i2c_device_id *id) |
326 | { | 326 | { |
327 | struct wm8728_priv *wm8728; | 327 | struct wm8728_priv *wm8728; |
328 | int ret; | 328 | int ret; |
@@ -344,7 +344,7 @@ static __devinit int wm8728_i2c_probe(struct i2c_client *i2c, | |||
344 | return ret; | 344 | return ret; |
345 | } | 345 | } |
346 | 346 | ||
347 | static __devexit int wm8728_i2c_remove(struct i2c_client *client) | 347 | static int wm8728_i2c_remove(struct i2c_client *client) |
348 | { | 348 | { |
349 | snd_soc_unregister_codec(&client->dev); | 349 | snd_soc_unregister_codec(&client->dev); |
350 | return 0; | 350 | return 0; |
@@ -363,7 +363,7 @@ static struct i2c_driver wm8728_i2c_driver = { | |||
363 | .of_match_table = wm8728_of_match, | 363 | .of_match_table = wm8728_of_match, |
364 | }, | 364 | }, |
365 | .probe = wm8728_i2c_probe, | 365 | .probe = wm8728_i2c_probe, |
366 | .remove = __devexit_p(wm8728_i2c_remove), | 366 | .remove = wm8728_i2c_remove, |
367 | .id_table = wm8728_i2c_id, | 367 | .id_table = wm8728_i2c_id, |
368 | }; | 368 | }; |
369 | #endif | 369 | #endif |