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/wm8776.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/wm8776.c')
-rw-r--r-- | sound/soc/codecs/wm8776.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index c32249ddb2e0..f31017ed1381 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
@@ -492,7 +492,7 @@ static const struct regmap_config wm8776_regmap = { | |||
492 | }; | 492 | }; |
493 | 493 | ||
494 | #if defined(CONFIG_SPI_MASTER) | 494 | #if defined(CONFIG_SPI_MASTER) |
495 | static int __devinit wm8776_spi_probe(struct spi_device *spi) | 495 | static int wm8776_spi_probe(struct spi_device *spi) |
496 | { | 496 | { |
497 | struct wm8776_priv *wm8776; | 497 | struct wm8776_priv *wm8776; |
498 | int ret; | 498 | int ret; |
@@ -514,7 +514,7 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi) | |||
514 | return ret; | 514 | return ret; |
515 | } | 515 | } |
516 | 516 | ||
517 | static int __devexit wm8776_spi_remove(struct spi_device *spi) | 517 | static int wm8776_spi_remove(struct spi_device *spi) |
518 | { | 518 | { |
519 | snd_soc_unregister_codec(&spi->dev); | 519 | snd_soc_unregister_codec(&spi->dev); |
520 | return 0; | 520 | return 0; |
@@ -527,13 +527,13 @@ static struct spi_driver wm8776_spi_driver = { | |||
527 | .of_match_table = wm8776_of_match, | 527 | .of_match_table = wm8776_of_match, |
528 | }, | 528 | }, |
529 | .probe = wm8776_spi_probe, | 529 | .probe = wm8776_spi_probe, |
530 | .remove = __devexit_p(wm8776_spi_remove), | 530 | .remove = wm8776_spi_remove, |
531 | }; | 531 | }; |
532 | #endif /* CONFIG_SPI_MASTER */ | 532 | #endif /* CONFIG_SPI_MASTER */ |
533 | 533 | ||
534 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 534 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
535 | static __devinit int wm8776_i2c_probe(struct i2c_client *i2c, | 535 | static int wm8776_i2c_probe(struct i2c_client *i2c, |
536 | const struct i2c_device_id *id) | 536 | const struct i2c_device_id *id) |
537 | { | 537 | { |
538 | struct wm8776_priv *wm8776; | 538 | struct wm8776_priv *wm8776; |
539 | int ret; | 539 | int ret; |
@@ -555,7 +555,7 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c, | |||
555 | return ret; | 555 | return ret; |
556 | } | 556 | } |
557 | 557 | ||
558 | static __devexit int wm8776_i2c_remove(struct i2c_client *client) | 558 | static int wm8776_i2c_remove(struct i2c_client *client) |
559 | { | 559 | { |
560 | snd_soc_unregister_codec(&client->dev); | 560 | snd_soc_unregister_codec(&client->dev); |
561 | return 0; | 561 | return 0; |
@@ -575,7 +575,7 @@ static struct i2c_driver wm8776_i2c_driver = { | |||
575 | .of_match_table = wm8776_of_match, | 575 | .of_match_table = wm8776_of_match, |
576 | }, | 576 | }, |
577 | .probe = wm8776_i2c_probe, | 577 | .probe = wm8776_i2c_probe, |
578 | .remove = __devexit_p(wm8776_i2c_remove), | 578 | .remove = wm8776_i2c_remove, |
579 | .id_table = wm8776_i2c_id, | 579 | .id_table = wm8776_i2c_id, |
580 | }; | 580 | }; |
581 | #endif | 581 | #endif |