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/ak4642.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/ak4642.c')
-rw-r--r-- | sound/soc/codecs/ak4642.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 546466abb77f..1f0cdab03294 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c | |||
@@ -513,15 +513,15 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4648 = { | |||
513 | }; | 513 | }; |
514 | 514 | ||
515 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 515 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
516 | static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, | 516 | static int ak4642_i2c_probe(struct i2c_client *i2c, |
517 | const struct i2c_device_id *id) | 517 | const struct i2c_device_id *id) |
518 | { | 518 | { |
519 | return snd_soc_register_codec(&i2c->dev, | 519 | return snd_soc_register_codec(&i2c->dev, |
520 | (struct snd_soc_codec_driver *)id->driver_data, | 520 | (struct snd_soc_codec_driver *)id->driver_data, |
521 | &ak4642_dai, 1); | 521 | &ak4642_dai, 1); |
522 | } | 522 | } |
523 | 523 | ||
524 | static __devexit int ak4642_i2c_remove(struct i2c_client *client) | 524 | static int ak4642_i2c_remove(struct i2c_client *client) |
525 | { | 525 | { |
526 | snd_soc_unregister_codec(&client->dev); | 526 | snd_soc_unregister_codec(&client->dev); |
527 | return 0; | 527 | return 0; |
@@ -541,7 +541,7 @@ static struct i2c_driver ak4642_i2c_driver = { | |||
541 | .owner = THIS_MODULE, | 541 | .owner = THIS_MODULE, |
542 | }, | 542 | }, |
543 | .probe = ak4642_i2c_probe, | 543 | .probe = ak4642_i2c_probe, |
544 | .remove = __devexit_p(ak4642_i2c_remove), | 544 | .remove = ak4642_i2c_remove, |
545 | .id_table = ak4642_i2c_id, | 545 | .id_table = ak4642_i2c_id, |
546 | }; | 546 | }; |
547 | #endif | 547 | #endif |