diff options
101 files changed, 412 insertions, 412 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 9fd3b6827bba..60159c07448d 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c | |||
@@ -1423,7 +1423,7 @@ static struct snd_soc_codec_driver soc_codec_dev_pm860x = { | |||
1423 | .num_dapm_routes = ARRAY_SIZE(pm860x_dapm_routes), | 1423 | .num_dapm_routes = ARRAY_SIZE(pm860x_dapm_routes), |
1424 | }; | 1424 | }; |
1425 | 1425 | ||
1426 | static int __devinit pm860x_codec_probe(struct platform_device *pdev) | 1426 | static int pm860x_codec_probe(struct platform_device *pdev) |
1427 | { | 1427 | { |
1428 | struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); | 1428 | struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); |
1429 | struct pm860x_priv *pm860x; | 1429 | struct pm860x_priv *pm860x; |
@@ -1463,7 +1463,7 @@ out: | |||
1463 | return -EINVAL; | 1463 | return -EINVAL; |
1464 | } | 1464 | } |
1465 | 1465 | ||
1466 | static int __devexit pm860x_codec_remove(struct platform_device *pdev) | 1466 | static int pm860x_codec_remove(struct platform_device *pdev) |
1467 | { | 1467 | { |
1468 | snd_soc_unregister_codec(&pdev->dev); | 1468 | snd_soc_unregister_codec(&pdev->dev); |
1469 | platform_set_drvdata(pdev, NULL); | 1469 | platform_set_drvdata(pdev, NULL); |
@@ -1476,7 +1476,7 @@ static struct platform_driver pm860x_codec_driver = { | |||
1476 | .owner = THIS_MODULE, | 1476 | .owner = THIS_MODULE, |
1477 | }, | 1477 | }, |
1478 | .probe = pm860x_codec_probe, | 1478 | .probe = pm860x_codec_probe, |
1479 | .remove = __devexit_p(pm860x_codec_remove), | 1479 | .remove = pm860x_codec_remove, |
1480 | }; | 1480 | }; |
1481 | 1481 | ||
1482 | module_platform_driver(pm860x_codec_driver); | 1482 | module_platform_driver(pm860x_codec_driver); |
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 4d96090db662..6c12ac206ee9 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c | |||
@@ -2554,7 +2554,7 @@ static struct snd_soc_codec_driver ab8500_codec_driver = { | |||
2554 | .num_dapm_routes = ARRAY_SIZE(ab8500_dapm_routes), | 2554 | .num_dapm_routes = ARRAY_SIZE(ab8500_dapm_routes), |
2555 | }; | 2555 | }; |
2556 | 2556 | ||
2557 | static int __devinit ab8500_codec_driver_probe(struct platform_device *pdev) | 2557 | static int ab8500_codec_driver_probe(struct platform_device *pdev) |
2558 | { | 2558 | { |
2559 | int status; | 2559 | int status; |
2560 | struct ab8500_codec_drvdata *drvdata; | 2560 | struct ab8500_codec_drvdata *drvdata; |
@@ -2580,7 +2580,7 @@ static int __devinit ab8500_codec_driver_probe(struct platform_device *pdev) | |||
2580 | return status; | 2580 | return status; |
2581 | } | 2581 | } |
2582 | 2582 | ||
2583 | static int __devexit ab8500_codec_driver_remove(struct platform_device *pdev) | 2583 | static int ab8500_codec_driver_remove(struct platform_device *pdev) |
2584 | { | 2584 | { |
2585 | dev_info(&pdev->dev, "%s Enter.\n", __func__); | 2585 | dev_info(&pdev->dev, "%s Enter.\n", __func__); |
2586 | 2586 | ||
@@ -2595,7 +2595,7 @@ static struct platform_driver ab8500_codec_platform_driver = { | |||
2595 | .owner = THIS_MODULE, | 2595 | .owner = THIS_MODULE, |
2596 | }, | 2596 | }, |
2597 | .probe = ab8500_codec_driver_probe, | 2597 | .probe = ab8500_codec_driver_probe, |
2598 | .remove = __devexit_p(ab8500_codec_driver_remove), | 2598 | .remove = ab8500_codec_driver_remove, |
2599 | .suspend = NULL, | 2599 | .suspend = NULL, |
2600 | .resume = NULL, | 2600 | .resume = NULL, |
2601 | }; | 2601 | }; |
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index ea06b834a7de..ef2ae32ffc66 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c | |||
@@ -118,13 +118,13 @@ static struct snd_soc_codec_driver soc_codec_dev_ac97 = { | |||
118 | .resume = ac97_soc_resume, | 118 | .resume = ac97_soc_resume, |
119 | }; | 119 | }; |
120 | 120 | ||
121 | static __devinit int ac97_probe(struct platform_device *pdev) | 121 | static int ac97_probe(struct platform_device *pdev) |
122 | { | 122 | { |
123 | return snd_soc_register_codec(&pdev->dev, | 123 | return snd_soc_register_codec(&pdev->dev, |
124 | &soc_codec_dev_ac97, &ac97_dai, 1); | 124 | &soc_codec_dev_ac97, &ac97_dai, 1); |
125 | } | 125 | } |
126 | 126 | ||
127 | static int __devexit ac97_remove(struct platform_device *pdev) | 127 | static int ac97_remove(struct platform_device *pdev) |
128 | { | 128 | { |
129 | snd_soc_unregister_codec(&pdev->dev); | 129 | snd_soc_unregister_codec(&pdev->dev); |
130 | return 0; | 130 | return 0; |
@@ -137,7 +137,7 @@ static struct platform_driver ac97_codec_driver = { | |||
137 | }, | 137 | }, |
138 | 138 | ||
139 | .probe = ac97_probe, | 139 | .probe = ac97_probe, |
140 | .remove = __devexit_p(ac97_remove), | 140 | .remove = ac97_remove, |
141 | }; | 141 | }; |
142 | 142 | ||
143 | module_platform_driver(ac97_codec_driver); | 143 | module_platform_driver(ac97_codec_driver); |
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index dce6ebeef452..9a92b7962f41 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c | |||
@@ -360,7 +360,7 @@ static const struct regmap_config ad1836_regmap_config = { | |||
360 | .cache_type = REGCACHE_RBTREE, | 360 | .cache_type = REGCACHE_RBTREE, |
361 | }; | 361 | }; |
362 | 362 | ||
363 | static int __devinit ad1836_spi_probe(struct spi_device *spi) | 363 | static int ad1836_spi_probe(struct spi_device *spi) |
364 | { | 364 | { |
365 | struct ad1836_priv *ad1836; | 365 | struct ad1836_priv *ad1836; |
366 | int ret; | 366 | int ret; |
@@ -383,7 +383,7 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi) | |||
383 | return ret; | 383 | return ret; |
384 | } | 384 | } |
385 | 385 | ||
386 | static int __devexit ad1836_spi_remove(struct spi_device *spi) | 386 | static int ad1836_spi_remove(struct spi_device *spi) |
387 | { | 387 | { |
388 | snd_soc_unregister_codec(&spi->dev); | 388 | snd_soc_unregister_codec(&spi->dev); |
389 | return 0; | 389 | return 0; |
@@ -405,7 +405,7 @@ static struct spi_driver ad1836_spi_driver = { | |||
405 | .owner = THIS_MODULE, | 405 | .owner = THIS_MODULE, |
406 | }, | 406 | }, |
407 | .probe = ad1836_spi_probe, | 407 | .probe = ad1836_spi_probe, |
408 | .remove = __devexit_p(ad1836_spi_remove), | 408 | .remove = ad1836_spi_remove, |
409 | .id_table = ad1836_ids, | 409 | .id_table = ad1836_ids, |
410 | }; | 410 | }; |
411 | 411 | ||
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 2f752660f678..aea7e52cf714 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c | |||
@@ -378,7 +378,7 @@ static const struct regmap_config ad193x_spi_regmap_config = { | |||
378 | .volatile_reg = adau193x_reg_volatile, | 378 | .volatile_reg = adau193x_reg_volatile, |
379 | }; | 379 | }; |
380 | 380 | ||
381 | static int __devinit ad193x_spi_probe(struct spi_device *spi) | 381 | static int ad193x_spi_probe(struct spi_device *spi) |
382 | { | 382 | { |
383 | struct ad193x_priv *ad193x; | 383 | struct ad193x_priv *ad193x; |
384 | 384 | ||
@@ -397,7 +397,7 @@ static int __devinit ad193x_spi_probe(struct spi_device *spi) | |||
397 | &ad193x_dai, 1); | 397 | &ad193x_dai, 1); |
398 | } | 398 | } |
399 | 399 | ||
400 | static int __devexit ad193x_spi_remove(struct spi_device *spi) | 400 | static int ad193x_spi_remove(struct spi_device *spi) |
401 | { | 401 | { |
402 | snd_soc_unregister_codec(&spi->dev); | 402 | snd_soc_unregister_codec(&spi->dev); |
403 | return 0; | 403 | return 0; |
@@ -409,7 +409,7 @@ static struct spi_driver ad193x_spi_driver = { | |||
409 | .owner = THIS_MODULE, | 409 | .owner = THIS_MODULE, |
410 | }, | 410 | }, |
411 | .probe = ad193x_spi_probe, | 411 | .probe = ad193x_spi_probe, |
412 | .remove = __devexit_p(ad193x_spi_remove), | 412 | .remove = ad193x_spi_remove, |
413 | }; | 413 | }; |
414 | #endif | 414 | #endif |
415 | 415 | ||
@@ -430,8 +430,8 @@ static const struct i2c_device_id ad193x_id[] = { | |||
430 | }; | 430 | }; |
431 | MODULE_DEVICE_TABLE(i2c, ad193x_id); | 431 | MODULE_DEVICE_TABLE(i2c, ad193x_id); |
432 | 432 | ||
433 | static int __devinit ad193x_i2c_probe(struct i2c_client *client, | 433 | static int ad193x_i2c_probe(struct i2c_client *client, |
434 | const struct i2c_device_id *id) | 434 | const struct i2c_device_id *id) |
435 | { | 435 | { |
436 | struct ad193x_priv *ad193x; | 436 | struct ad193x_priv *ad193x; |
437 | 437 | ||
@@ -450,7 +450,7 @@ static int __devinit ad193x_i2c_probe(struct i2c_client *client, | |||
450 | &ad193x_dai, 1); | 450 | &ad193x_dai, 1); |
451 | } | 451 | } |
452 | 452 | ||
453 | static int __devexit ad193x_i2c_remove(struct i2c_client *client) | 453 | static int ad193x_i2c_remove(struct i2c_client *client) |
454 | { | 454 | { |
455 | snd_soc_unregister_codec(&client->dev); | 455 | snd_soc_unregister_codec(&client->dev); |
456 | return 0; | 456 | return 0; |
@@ -461,7 +461,7 @@ static struct i2c_driver ad193x_i2c_driver = { | |||
461 | .name = "ad193x", | 461 | .name = "ad193x", |
462 | }, | 462 | }, |
463 | .probe = ad193x_i2c_probe, | 463 | .probe = ad193x_i2c_probe, |
464 | .remove = __devexit_p(ad193x_i2c_remove), | 464 | .remove = ad193x_i2c_remove, |
465 | .id_table = ad193x_id, | 465 | .id_table = ad193x_id, |
466 | }; | 466 | }; |
467 | #endif | 467 | #endif |
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 8c39dddd7d00..f385342947d3 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c | |||
@@ -255,13 +255,13 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1980 = { | |||
255 | .read = ac97_read, | 255 | .read = ac97_read, |
256 | }; | 256 | }; |
257 | 257 | ||
258 | static __devinit int ad1980_probe(struct platform_device *pdev) | 258 | static int ad1980_probe(struct platform_device *pdev) |
259 | { | 259 | { |
260 | return snd_soc_register_codec(&pdev->dev, | 260 | return snd_soc_register_codec(&pdev->dev, |
261 | &soc_codec_dev_ad1980, &ad1980_dai, 1); | 261 | &soc_codec_dev_ad1980, &ad1980_dai, 1); |
262 | } | 262 | } |
263 | 263 | ||
264 | static int __devexit ad1980_remove(struct platform_device *pdev) | 264 | static int ad1980_remove(struct platform_device *pdev) |
265 | { | 265 | { |
266 | snd_soc_unregister_codec(&pdev->dev); | 266 | snd_soc_unregister_codec(&pdev->dev); |
267 | return 0; | 267 | return 0; |
@@ -274,7 +274,7 @@ static struct platform_driver ad1980_codec_driver = { | |||
274 | }, | 274 | }, |
275 | 275 | ||
276 | .probe = ad1980_probe, | 276 | .probe = ad1980_probe, |
277 | .remove = __devexit_p(ad1980_remove), | 277 | .remove = ad1980_remove, |
278 | }; | 278 | }; |
279 | 279 | ||
280 | module_platform_driver(ad1980_codec_driver); | 280 | module_platform_driver(ad1980_codec_driver); |
diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c index ee7a68dcefd2..b1f2baf42b48 100644 --- a/sound/soc/codecs/ad73311.c +++ b/sound/soc/codecs/ad73311.c | |||
@@ -47,7 +47,7 @@ static int ad73311_probe(struct platform_device *pdev) | |||
47 | &soc_codec_dev_ad73311, &ad73311_dai, 1); | 47 | &soc_codec_dev_ad73311, &ad73311_dai, 1); |
48 | } | 48 | } |
49 | 49 | ||
50 | static int __devexit ad73311_remove(struct platform_device *pdev) | 50 | static int ad73311_remove(struct platform_device *pdev) |
51 | { | 51 | { |
52 | snd_soc_unregister_codec(&pdev->dev); | 52 | snd_soc_unregister_codec(&pdev->dev); |
53 | return 0; | 53 | return 0; |
@@ -60,7 +60,7 @@ static struct platform_driver ad73311_codec_driver = { | |||
60 | }, | 60 | }, |
61 | 61 | ||
62 | .probe = ad73311_probe, | 62 | .probe = ad73311_probe, |
63 | .remove = __devexit_p(ad73311_remove), | 63 | .remove = ad73311_remove, |
64 | }; | 64 | }; |
65 | 65 | ||
66 | module_platform_driver(ad73311_codec_driver); | 66 | module_platform_driver(ad73311_codec_driver); |
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index 704544bfc90d..068b3ae56a17 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c | |||
@@ -1353,8 +1353,8 @@ static struct snd_soc_codec_driver adau1373_codec_driver = { | |||
1353 | .num_dapm_routes = ARRAY_SIZE(adau1373_dapm_routes), | 1353 | .num_dapm_routes = ARRAY_SIZE(adau1373_dapm_routes), |
1354 | }; | 1354 | }; |
1355 | 1355 | ||
1356 | static int __devinit adau1373_i2c_probe(struct i2c_client *client, | 1356 | static int adau1373_i2c_probe(struct i2c_client *client, |
1357 | const struct i2c_device_id *id) | 1357 | const struct i2c_device_id *id) |
1358 | { | 1358 | { |
1359 | struct adau1373 *adau1373; | 1359 | struct adau1373 *adau1373; |
1360 | int ret; | 1360 | int ret; |
@@ -1370,7 +1370,7 @@ static int __devinit adau1373_i2c_probe(struct i2c_client *client, | |||
1370 | return ret; | 1370 | return ret; |
1371 | } | 1371 | } |
1372 | 1372 | ||
1373 | static int __devexit adau1373_i2c_remove(struct i2c_client *client) | 1373 | static int adau1373_i2c_remove(struct i2c_client *client) |
1374 | { | 1374 | { |
1375 | snd_soc_unregister_codec(&client->dev); | 1375 | snd_soc_unregister_codec(&client->dev); |
1376 | return 0; | 1376 | return 0; |
@@ -1388,7 +1388,7 @@ static struct i2c_driver adau1373_i2c_driver = { | |||
1388 | .owner = THIS_MODULE, | 1388 | .owner = THIS_MODULE, |
1389 | }, | 1389 | }, |
1390 | .probe = adau1373_i2c_probe, | 1390 | .probe = adau1373_i2c_probe, |
1391 | .remove = __devexit_p(adau1373_i2c_remove), | 1391 | .remove = adau1373_i2c_remove, |
1392 | .id_table = adau1373_i2c_id, | 1392 | .id_table = adau1373_i2c_id, |
1393 | }; | 1393 | }; |
1394 | 1394 | ||
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index 51f2f3cd8136..dafdbe87edeb 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c | |||
@@ -489,8 +489,8 @@ static struct snd_soc_codec_driver adau1701_codec_drv = { | |||
489 | .set_sysclk = adau1701_set_sysclk, | 489 | .set_sysclk = adau1701_set_sysclk, |
490 | }; | 490 | }; |
491 | 491 | ||
492 | static __devinit int adau1701_i2c_probe(struct i2c_client *client, | 492 | static int adau1701_i2c_probe(struct i2c_client *client, |
493 | const struct i2c_device_id *id) | 493 | const struct i2c_device_id *id) |
494 | { | 494 | { |
495 | struct adau1701 *adau1701; | 495 | struct adau1701 *adau1701; |
496 | int ret; | 496 | int ret; |
@@ -505,7 +505,7 @@ static __devinit int adau1701_i2c_probe(struct i2c_client *client, | |||
505 | return ret; | 505 | return ret; |
506 | } | 506 | } |
507 | 507 | ||
508 | static __devexit int adau1701_i2c_remove(struct i2c_client *client) | 508 | static int adau1701_i2c_remove(struct i2c_client *client) |
509 | { | 509 | { |
510 | snd_soc_unregister_codec(&client->dev); | 510 | snd_soc_unregister_codec(&client->dev); |
511 | return 0; | 511 | return 0; |
@@ -523,7 +523,7 @@ static struct i2c_driver adau1701_i2c_driver = { | |||
523 | .owner = THIS_MODULE, | 523 | .owner = THIS_MODULE, |
524 | }, | 524 | }, |
525 | .probe = adau1701_i2c_probe, | 525 | .probe = adau1701_i2c_probe, |
526 | .remove = __devexit_p(adau1701_i2c_remove), | 526 | .remove = adau1701_i2c_remove, |
527 | .id_table = adau1701_i2c_id, | 527 | .id_table = adau1701_i2c_id, |
528 | }; | 528 | }; |
529 | 529 | ||
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index ebd7b37b902b..3c839cc4e00e 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c | |||
@@ -839,8 +839,8 @@ static struct snd_soc_codec_driver adav80x_codec_driver = { | |||
839 | .num_dapm_routes = ARRAY_SIZE(adav80x_dapm_routes), | 839 | .num_dapm_routes = ARRAY_SIZE(adav80x_dapm_routes), |
840 | }; | 840 | }; |
841 | 841 | ||
842 | static int __devinit adav80x_bus_probe(struct device *dev, | 842 | static int adav80x_bus_probe(struct device *dev, |
843 | enum snd_soc_control_type control_type) | 843 | enum snd_soc_control_type control_type) |
844 | { | 844 | { |
845 | struct adav80x *adav80x; | 845 | struct adav80x *adav80x; |
846 | int ret; | 846 | int ret; |
@@ -860,7 +860,7 @@ static int __devinit adav80x_bus_probe(struct device *dev, | |||
860 | return ret; | 860 | return ret; |
861 | } | 861 | } |
862 | 862 | ||
863 | static int __devexit adav80x_bus_remove(struct device *dev) | 863 | static int adav80x_bus_remove(struct device *dev) |
864 | { | 864 | { |
865 | snd_soc_unregister_codec(dev); | 865 | snd_soc_unregister_codec(dev); |
866 | kfree(dev_get_drvdata(dev)); | 866 | kfree(dev_get_drvdata(dev)); |
@@ -868,12 +868,12 @@ static int __devexit adav80x_bus_remove(struct device *dev) | |||
868 | } | 868 | } |
869 | 869 | ||
870 | #if defined(CONFIG_SPI_MASTER) | 870 | #if defined(CONFIG_SPI_MASTER) |
871 | static int __devinit adav80x_spi_probe(struct spi_device *spi) | 871 | static int adav80x_spi_probe(struct spi_device *spi) |
872 | { | 872 | { |
873 | return adav80x_bus_probe(&spi->dev, SND_SOC_SPI); | 873 | return adav80x_bus_probe(&spi->dev, SND_SOC_SPI); |
874 | } | 874 | } |
875 | 875 | ||
876 | static int __devexit adav80x_spi_remove(struct spi_device *spi) | 876 | static int adav80x_spi_remove(struct spi_device *spi) |
877 | { | 877 | { |
878 | return adav80x_bus_remove(&spi->dev); | 878 | return adav80x_bus_remove(&spi->dev); |
879 | } | 879 | } |
@@ -884,7 +884,7 @@ static struct spi_driver adav80x_spi_driver = { | |||
884 | .owner = THIS_MODULE, | 884 | .owner = THIS_MODULE, |
885 | }, | 885 | }, |
886 | .probe = adav80x_spi_probe, | 886 | .probe = adav80x_spi_probe, |
887 | .remove = __devexit_p(adav80x_spi_remove), | 887 | .remove = adav80x_spi_remove, |
888 | }; | 888 | }; |
889 | #endif | 889 | #endif |
890 | 890 | ||
@@ -895,13 +895,13 @@ static const struct i2c_device_id adav80x_id[] = { | |||
895 | }; | 895 | }; |
896 | MODULE_DEVICE_TABLE(i2c, adav80x_id); | 896 | MODULE_DEVICE_TABLE(i2c, adav80x_id); |
897 | 897 | ||
898 | static int __devinit adav80x_i2c_probe(struct i2c_client *client, | 898 | static int adav80x_i2c_probe(struct i2c_client *client, |
899 | const struct i2c_device_id *id) | 899 | const struct i2c_device_id *id) |
900 | { | 900 | { |
901 | return adav80x_bus_probe(&client->dev, SND_SOC_I2C); | 901 | return adav80x_bus_probe(&client->dev, SND_SOC_I2C); |
902 | } | 902 | } |
903 | 903 | ||
904 | static int __devexit adav80x_i2c_remove(struct i2c_client *client) | 904 | static int adav80x_i2c_remove(struct i2c_client *client) |
905 | { | 905 | { |
906 | return adav80x_bus_remove(&client->dev); | 906 | return adav80x_bus_remove(&client->dev); |
907 | } | 907 | } |
@@ -912,7 +912,7 @@ static struct i2c_driver adav80x_i2c_driver = { | |||
912 | .owner = THIS_MODULE, | 912 | .owner = THIS_MODULE, |
913 | }, | 913 | }, |
914 | .probe = adav80x_i2c_probe, | 914 | .probe = adav80x_i2c_probe, |
915 | .remove = __devexit_p(adav80x_i2c_remove), | 915 | .remove = adav80x_i2c_remove, |
916 | .id_table = adav80x_id, | 916 | .id_table = adav80x_id, |
917 | }; | 917 | }; |
918 | #endif | 918 | #endif |
diff --git a/sound/soc/codecs/ads117x.c b/sound/soc/codecs/ads117x.c index 8103b938b8c0..506d474c4d22 100644 --- a/sound/soc/codecs/ads117x.c +++ b/sound/soc/codecs/ads117x.c | |||
@@ -36,13 +36,13 @@ static struct snd_soc_dai_driver ads117x_dai = { | |||
36 | 36 | ||
37 | static struct snd_soc_codec_driver soc_codec_dev_ads117x; | 37 | static struct snd_soc_codec_driver soc_codec_dev_ads117x; |
38 | 38 | ||
39 | static __devinit int ads117x_probe(struct platform_device *pdev) | 39 | static int ads117x_probe(struct platform_device *pdev) |
40 | { | 40 | { |
41 | return snd_soc_register_codec(&pdev->dev, | 41 | return snd_soc_register_codec(&pdev->dev, |
42 | &soc_codec_dev_ads117x, &ads117x_dai, 1); | 42 | &soc_codec_dev_ads117x, &ads117x_dai, 1); |
43 | } | 43 | } |
44 | 44 | ||
45 | static int __devexit ads117x_remove(struct platform_device *pdev) | 45 | static int ads117x_remove(struct platform_device *pdev) |
46 | { | 46 | { |
47 | snd_soc_unregister_codec(&pdev->dev); | 47 | snd_soc_unregister_codec(&pdev->dev); |
48 | return 0; | 48 | return 0; |
@@ -55,7 +55,7 @@ static struct platform_driver ads117x_codec_driver = { | |||
55 | }, | 55 | }, |
56 | 56 | ||
57 | .probe = ads117x_probe, | 57 | .probe = ads117x_probe, |
58 | .remove = __devexit_p(ads117x_remove), | 58 | .remove = ads117x_remove, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | module_platform_driver(ads117x_codec_driver); | 61 | module_platform_driver(ads117x_codec_driver); |
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index 4b11b82b2273..6f6c335a5baa 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c | |||
@@ -258,7 +258,7 @@ static int ak4104_spi_probe(struct spi_device *spi) | |||
258 | return ret; | 258 | return ret; |
259 | } | 259 | } |
260 | 260 | ||
261 | static int __devexit ak4104_spi_remove(struct spi_device *spi) | 261 | static int ak4104_spi_remove(struct spi_device *spi) |
262 | { | 262 | { |
263 | snd_soc_unregister_codec(&spi->dev); | 263 | snd_soc_unregister_codec(&spi->dev); |
264 | return 0; | 264 | return 0; |
@@ -277,7 +277,7 @@ static struct spi_driver ak4104_spi_driver = { | |||
277 | .of_match_table = ak4104_of_match, | 277 | .of_match_table = ak4104_of_match, |
278 | }, | 278 | }, |
279 | .probe = ak4104_spi_probe, | 279 | .probe = ak4104_spi_probe, |
280 | .remove = __devexit_p(ak4104_spi_remove), | 280 | .remove = ak4104_spi_remove, |
281 | }; | 281 | }; |
282 | 282 | ||
283 | module_spi_driver(ak4104_spi_driver); | 283 | module_spi_driver(ak4104_spi_driver); |
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index fc5581063b2d..684fe910669f 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c | |||
@@ -436,8 +436,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4535 = { | |||
436 | .num_dapm_routes = ARRAY_SIZE(ak4535_audio_map), | 436 | .num_dapm_routes = ARRAY_SIZE(ak4535_audio_map), |
437 | }; | 437 | }; |
438 | 438 | ||
439 | static __devinit int ak4535_i2c_probe(struct i2c_client *i2c, | 439 | static int ak4535_i2c_probe(struct i2c_client *i2c, |
440 | const struct i2c_device_id *id) | 440 | const struct i2c_device_id *id) |
441 | { | 441 | { |
442 | struct ak4535_priv *ak4535; | 442 | struct ak4535_priv *ak4535; |
443 | int ret; | 443 | int ret; |
@@ -462,7 +462,7 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c, | |||
462 | return ret; | 462 | return ret; |
463 | } | 463 | } |
464 | 464 | ||
465 | static __devexit int ak4535_i2c_remove(struct i2c_client *client) | 465 | static int ak4535_i2c_remove(struct i2c_client *client) |
466 | { | 466 | { |
467 | snd_soc_unregister_codec(&client->dev); | 467 | snd_soc_unregister_codec(&client->dev); |
468 | return 0; | 468 | return 0; |
@@ -480,7 +480,7 @@ static struct i2c_driver ak4535_i2c_driver = { | |||
480 | .owner = THIS_MODULE, | 480 | .owner = THIS_MODULE, |
481 | }, | 481 | }, |
482 | .probe = ak4535_i2c_probe, | 482 | .probe = ak4535_i2c_probe, |
483 | .remove = __devexit_p(ak4535_i2c_remove), | 483 | .remove = ak4535_i2c_remove, |
484 | .id_table = ak4535_i2c_id, | 484 | .id_table = ak4535_i2c_id, |
485 | }; | 485 | }; |
486 | 486 | ||
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c index 543a12f471be..5f9af1fb76e8 100644 --- a/sound/soc/codecs/ak4641.c +++ b/sound/soc/codecs/ak4641.c | |||
@@ -557,8 +557,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4641 = { | |||
557 | }; | 557 | }; |
558 | 558 | ||
559 | 559 | ||
560 | static int __devinit ak4641_i2c_probe(struct i2c_client *i2c, | 560 | static int ak4641_i2c_probe(struct i2c_client *i2c, |
561 | const struct i2c_device_id *id) | 561 | const struct i2c_device_id *id) |
562 | { | 562 | { |
563 | struct ak4641_platform_data *pdata = i2c->dev.platform_data; | 563 | struct ak4641_platform_data *pdata = i2c->dev.platform_data; |
564 | struct ak4641_priv *ak4641; | 564 | struct ak4641_priv *ak4641; |
@@ -610,7 +610,7 @@ err_out: | |||
610 | return ret; | 610 | return ret; |
611 | } | 611 | } |
612 | 612 | ||
613 | static int __devexit ak4641_i2c_remove(struct i2c_client *i2c) | 613 | static int ak4641_i2c_remove(struct i2c_client *i2c) |
614 | { | 614 | { |
615 | struct ak4641_platform_data *pdata = i2c->dev.platform_data; | 615 | struct ak4641_platform_data *pdata = i2c->dev.platform_data; |
616 | 616 | ||
@@ -640,7 +640,7 @@ static struct i2c_driver ak4641_i2c_driver = { | |||
640 | .owner = THIS_MODULE, | 640 | .owner = THIS_MODULE, |
641 | }, | 641 | }, |
642 | .probe = ak4641_i2c_probe, | 642 | .probe = ak4641_i2c_probe, |
643 | .remove = __devexit_p(ak4641_i2c_remove), | 643 | .remove = ak4641_i2c_remove, |
644 | .id_table = ak4641_i2c_id, | 644 | .id_table = ak4641_i2c_id, |
645 | }; | 645 | }; |
646 | 646 | ||
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 |
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index 2b457976a7bf..25bdf6ad4a54 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c | |||
@@ -655,8 +655,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4671 = { | |||
655 | .num_dapm_routes = ARRAY_SIZE(ak4671_intercon), | 655 | .num_dapm_routes = ARRAY_SIZE(ak4671_intercon), |
656 | }; | 656 | }; |
657 | 657 | ||
658 | static int __devinit ak4671_i2c_probe(struct i2c_client *client, | 658 | static int ak4671_i2c_probe(struct i2c_client *client, |
659 | const struct i2c_device_id *id) | 659 | const struct i2c_device_id *id) |
660 | { | 660 | { |
661 | struct ak4671_priv *ak4671; | 661 | struct ak4671_priv *ak4671; |
662 | int ret; | 662 | int ret; |
@@ -674,7 +674,7 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client, | |||
674 | return ret; | 674 | return ret; |
675 | } | 675 | } |
676 | 676 | ||
677 | static __devexit int ak4671_i2c_remove(struct i2c_client *client) | 677 | static int ak4671_i2c_remove(struct i2c_client *client) |
678 | { | 678 | { |
679 | snd_soc_unregister_codec(&client->dev); | 679 | snd_soc_unregister_codec(&client->dev); |
680 | return 0; | 680 | return 0; |
@@ -692,7 +692,7 @@ static struct i2c_driver ak4671_i2c_driver = { | |||
692 | .owner = THIS_MODULE, | 692 | .owner = THIS_MODULE, |
693 | }, | 693 | }, |
694 | .probe = ak4671_i2c_probe, | 694 | .probe = ak4671_i2c_probe, |
695 | .remove = __devexit_p(ak4671_i2c_remove), | 695 | .remove = ak4671_i2c_remove, |
696 | .id_table = ak4671_i2c_id, | 696 | .id_table = ak4671_i2c_id, |
697 | }; | 697 | }; |
698 | 698 | ||
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c index 1960478ce6bb..256c364193a5 100644 --- a/sound/soc/codecs/alc5623.c +++ b/sound/soc/codecs/alc5623.c | |||
@@ -991,8 +991,8 @@ static struct snd_soc_codec_driver soc_codec_device_alc5623 = { | |||
991 | * low = 0x1a | 991 | * low = 0x1a |
992 | * high = 0x1b | 992 | * high = 0x1b |
993 | */ | 993 | */ |
994 | static __devinit int alc5623_i2c_probe(struct i2c_client *client, | 994 | static int alc5623_i2c_probe(struct i2c_client *client, |
995 | const struct i2c_device_id *id) | 995 | const struct i2c_device_id *id) |
996 | { | 996 | { |
997 | struct alc5623_platform_data *pdata; | 997 | struct alc5623_platform_data *pdata; |
998 | struct alc5623_priv *alc5623; | 998 | struct alc5623_priv *alc5623; |
@@ -1058,7 +1058,7 @@ static __devinit int alc5623_i2c_probe(struct i2c_client *client, | |||
1058 | return ret; | 1058 | return ret; |
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | static __devexit int alc5623_i2c_remove(struct i2c_client *client) | 1061 | static int alc5623_i2c_remove(struct i2c_client *client) |
1062 | { | 1062 | { |
1063 | snd_soc_unregister_codec(&client->dev); | 1063 | snd_soc_unregister_codec(&client->dev); |
1064 | return 0; | 1064 | return 0; |
@@ -1079,7 +1079,7 @@ static struct i2c_driver alc5623_i2c_driver = { | |||
1079 | .owner = THIS_MODULE, | 1079 | .owner = THIS_MODULE, |
1080 | }, | 1080 | }, |
1081 | .probe = alc5623_i2c_probe, | 1081 | .probe = alc5623_i2c_probe, |
1082 | .remove = __devexit_p(alc5623_i2c_remove), | 1082 | .remove = alc5623_i2c_remove, |
1083 | .id_table = alc5623_i2c_table, | 1083 | .id_table = alc5623_i2c_table, |
1084 | }; | 1084 | }; |
1085 | 1085 | ||
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index 7dd02420b36d..f2e62e45f912 100644 --- a/sound/soc/codecs/alc5632.c +++ b/sound/soc/codecs/alc5632.c | |||
@@ -1116,8 +1116,8 @@ static struct regmap_config alc5632_regmap = { | |||
1116 | * low = 0x1a | 1116 | * low = 0x1a |
1117 | * high = 0x1b | 1117 | * high = 0x1b |
1118 | */ | 1118 | */ |
1119 | static __devinit int alc5632_i2c_probe(struct i2c_client *client, | 1119 | static int alc5632_i2c_probe(struct i2c_client *client, |
1120 | const struct i2c_device_id *id) | 1120 | const struct i2c_device_id *id) |
1121 | { | 1121 | { |
1122 | struct alc5632_priv *alc5632; | 1122 | struct alc5632_priv *alc5632; |
1123 | int ret, ret1, ret2; | 1123 | int ret, ret1, ret2; |
@@ -1179,7 +1179,7 @@ static __devinit int alc5632_i2c_probe(struct i2c_client *client, | |||
1179 | return ret; | 1179 | return ret; |
1180 | } | 1180 | } |
1181 | 1181 | ||
1182 | static __devexit int alc5632_i2c_remove(struct i2c_client *client) | 1182 | static int alc5632_i2c_remove(struct i2c_client *client) |
1183 | { | 1183 | { |
1184 | snd_soc_unregister_codec(&client->dev); | 1184 | snd_soc_unregister_codec(&client->dev); |
1185 | return 0; | 1185 | return 0; |
@@ -1198,7 +1198,7 @@ static struct i2c_driver alc5632_i2c_driver = { | |||
1198 | .owner = THIS_MODULE, | 1198 | .owner = THIS_MODULE, |
1199 | }, | 1199 | }, |
1200 | .probe = alc5632_i2c_probe, | 1200 | .probe = alc5632_i2c_probe, |
1201 | .remove = __devexit_p(alc5632_i2c_remove), | 1201 | .remove = alc5632_i2c_remove, |
1202 | .id_table = alc5632_i2c_table, | 1202 | .id_table = alc5632_i2c_table, |
1203 | }; | 1203 | }; |
1204 | 1204 | ||
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 064cd6a93516..23316c887b19 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c | |||
@@ -201,7 +201,7 @@ static struct platform_driver cq93vc_codec_driver = { | |||
201 | }, | 201 | }, |
202 | 202 | ||
203 | .probe = cq93vc_platform_probe, | 203 | .probe = cq93vc_platform_probe, |
204 | .remove = __devexit_p(cq93vc_platform_remove), | 204 | .remove = cq93vc_platform_remove, |
205 | }; | 205 | }; |
206 | 206 | ||
207 | module_platform_driver(cq93vc_codec_driver); | 207 | module_platform_driver(cq93vc_codec_driver); |
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 6ad3878db8fc..4f1127935fdf 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c | |||
@@ -570,7 +570,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs4271 = { | |||
570 | }; | 570 | }; |
571 | 571 | ||
572 | #if defined(CONFIG_SPI_MASTER) | 572 | #if defined(CONFIG_SPI_MASTER) |
573 | static int __devinit cs4271_spi_probe(struct spi_device *spi) | 573 | static int cs4271_spi_probe(struct spi_device *spi) |
574 | { | 574 | { |
575 | struct cs4271_private *cs4271; | 575 | struct cs4271_private *cs4271; |
576 | 576 | ||
@@ -585,7 +585,7 @@ static int __devinit cs4271_spi_probe(struct spi_device *spi) | |||
585 | &cs4271_dai, 1); | 585 | &cs4271_dai, 1); |
586 | } | 586 | } |
587 | 587 | ||
588 | static int __devexit cs4271_spi_remove(struct spi_device *spi) | 588 | static int cs4271_spi_remove(struct spi_device *spi) |
589 | { | 589 | { |
590 | snd_soc_unregister_codec(&spi->dev); | 590 | snd_soc_unregister_codec(&spi->dev); |
591 | return 0; | 591 | return 0; |
@@ -598,7 +598,7 @@ static struct spi_driver cs4271_spi_driver = { | |||
598 | .of_match_table = of_match_ptr(cs4271_dt_ids), | 598 | .of_match_table = of_match_ptr(cs4271_dt_ids), |
599 | }, | 599 | }, |
600 | .probe = cs4271_spi_probe, | 600 | .probe = cs4271_spi_probe, |
601 | .remove = __devexit_p(cs4271_spi_remove), | 601 | .remove = cs4271_spi_remove, |
602 | }; | 602 | }; |
603 | #endif /* defined(CONFIG_SPI_MASTER) */ | 603 | #endif /* defined(CONFIG_SPI_MASTER) */ |
604 | 604 | ||
@@ -609,8 +609,8 @@ static const struct i2c_device_id cs4271_i2c_id[] = { | |||
609 | }; | 609 | }; |
610 | MODULE_DEVICE_TABLE(i2c, cs4271_i2c_id); | 610 | MODULE_DEVICE_TABLE(i2c, cs4271_i2c_id); |
611 | 611 | ||
612 | static int __devinit cs4271_i2c_probe(struct i2c_client *client, | 612 | static int cs4271_i2c_probe(struct i2c_client *client, |
613 | const struct i2c_device_id *id) | 613 | const struct i2c_device_id *id) |
614 | { | 614 | { |
615 | struct cs4271_private *cs4271; | 615 | struct cs4271_private *cs4271; |
616 | 616 | ||
@@ -625,7 +625,7 @@ static int __devinit cs4271_i2c_probe(struct i2c_client *client, | |||
625 | &cs4271_dai, 1); | 625 | &cs4271_dai, 1); |
626 | } | 626 | } |
627 | 627 | ||
628 | static int __devexit cs4271_i2c_remove(struct i2c_client *client) | 628 | static int cs4271_i2c_remove(struct i2c_client *client) |
629 | { | 629 | { |
630 | snd_soc_unregister_codec(&client->dev); | 630 | snd_soc_unregister_codec(&client->dev); |
631 | return 0; | 631 | return 0; |
@@ -639,7 +639,7 @@ static struct i2c_driver cs4271_i2c_driver = { | |||
639 | }, | 639 | }, |
640 | .id_table = cs4271_i2c_id, | 640 | .id_table = cs4271_i2c_id, |
641 | .probe = cs4271_i2c_probe, | 641 | .probe = cs4271_i2c_probe, |
642 | .remove = __devexit_p(cs4271_i2c_remove), | 642 | .remove = cs4271_i2c_remove, |
643 | }; | 643 | }; |
644 | #endif /* defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) */ | 644 | #endif /* defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) */ |
645 | 645 | ||
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 97a81051e88d..99bb1c69499e 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c | |||
@@ -1271,7 +1271,7 @@ static struct i2c_driver cs42l52_i2c_driver = { | |||
1271 | }, | 1271 | }, |
1272 | .id_table = cs42l52_id, | 1272 | .id_table = cs42l52_id, |
1273 | .probe = cs42l52_i2c_probe, | 1273 | .probe = cs42l52_i2c_probe, |
1274 | .remove = __devexit_p(cs42l52_i2c_remove), | 1274 | .remove = cs42l52_i2c_remove, |
1275 | }; | 1275 | }; |
1276 | 1276 | ||
1277 | module_i2c_driver(cs42l52_i2c_driver); | 1277 | module_i2c_driver(cs42l52_i2c_driver); |
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 2c08c4cb465a..a0791ecf6d95 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c | |||
@@ -1345,8 +1345,8 @@ static struct regmap_config cs42l73_regmap = { | |||
1345 | .cache_type = REGCACHE_RBTREE, | 1345 | .cache_type = REGCACHE_RBTREE, |
1346 | }; | 1346 | }; |
1347 | 1347 | ||
1348 | static __devinit int cs42l73_i2c_probe(struct i2c_client *i2c_client, | 1348 | static int cs42l73_i2c_probe(struct i2c_client *i2c_client, |
1349 | const struct i2c_device_id *id) | 1349 | const struct i2c_device_id *id) |
1350 | { | 1350 | { |
1351 | struct cs42l73_private *cs42l73; | 1351 | struct cs42l73_private *cs42l73; |
1352 | int ret; | 1352 | int ret; |
@@ -1406,7 +1406,7 @@ static __devinit int cs42l73_i2c_probe(struct i2c_client *i2c_client, | |||
1406 | return 0; | 1406 | return 0; |
1407 | } | 1407 | } |
1408 | 1408 | ||
1409 | static __devexit int cs42l73_i2c_remove(struct i2c_client *client) | 1409 | static int cs42l73_i2c_remove(struct i2c_client *client) |
1410 | { | 1410 | { |
1411 | snd_soc_unregister_codec(&client->dev); | 1411 | snd_soc_unregister_codec(&client->dev); |
1412 | return 0; | 1412 | return 0; |
@@ -1426,7 +1426,7 @@ static struct i2c_driver cs42l73_i2c_driver = { | |||
1426 | }, | 1426 | }, |
1427 | .id_table = cs42l73_id, | 1427 | .id_table = cs42l73_id, |
1428 | .probe = cs42l73_i2c_probe, | 1428 | .probe = cs42l73_i2c_probe, |
1429 | .remove = __devexit_p(cs42l73_i2c_remove), | 1429 | .remove = cs42l73_i2c_remove, |
1430 | 1430 | ||
1431 | }; | 1431 | }; |
1432 | 1432 | ||
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 843c1eb72faf..9c1231456502 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c | |||
@@ -1218,8 +1218,8 @@ static const struct regmap_config da7210_regmap_config_i2c = { | |||
1218 | .cache_type = REGCACHE_RBTREE, | 1218 | .cache_type = REGCACHE_RBTREE, |
1219 | }; | 1219 | }; |
1220 | 1220 | ||
1221 | static int __devinit da7210_i2c_probe(struct i2c_client *i2c, | 1221 | static int da7210_i2c_probe(struct i2c_client *i2c, |
1222 | const struct i2c_device_id *id) | 1222 | const struct i2c_device_id *id) |
1223 | { | 1223 | { |
1224 | struct da7210_priv *da7210; | 1224 | struct da7210_priv *da7210; |
1225 | int ret; | 1225 | int ret; |
@@ -1251,7 +1251,7 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, | |||
1251 | return ret; | 1251 | return ret; |
1252 | } | 1252 | } |
1253 | 1253 | ||
1254 | static int __devexit da7210_i2c_remove(struct i2c_client *client) | 1254 | static int da7210_i2c_remove(struct i2c_client *client) |
1255 | { | 1255 | { |
1256 | snd_soc_unregister_codec(&client->dev); | 1256 | snd_soc_unregister_codec(&client->dev); |
1257 | return 0; | 1257 | return 0; |
@@ -1270,7 +1270,7 @@ static struct i2c_driver da7210_i2c_driver = { | |||
1270 | .owner = THIS_MODULE, | 1270 | .owner = THIS_MODULE, |
1271 | }, | 1271 | }, |
1272 | .probe = da7210_i2c_probe, | 1272 | .probe = da7210_i2c_probe, |
1273 | .remove = __devexit_p(da7210_i2c_remove), | 1273 | .remove = da7210_i2c_remove, |
1274 | .id_table = da7210_i2c_id, | 1274 | .id_table = da7210_i2c_id, |
1275 | }; | 1275 | }; |
1276 | #endif | 1276 | #endif |
@@ -1314,7 +1314,7 @@ static const struct regmap_config da7210_regmap_config_spi = { | |||
1314 | .cache_type = REGCACHE_RBTREE, | 1314 | .cache_type = REGCACHE_RBTREE, |
1315 | }; | 1315 | }; |
1316 | 1316 | ||
1317 | static int __devinit da7210_spi_probe(struct spi_device *spi) | 1317 | static int da7210_spi_probe(struct spi_device *spi) |
1318 | { | 1318 | { |
1319 | struct da7210_priv *da7210; | 1319 | struct da7210_priv *da7210; |
1320 | int ret; | 1320 | int ret; |
@@ -1343,7 +1343,7 @@ static int __devinit da7210_spi_probe(struct spi_device *spi) | |||
1343 | return ret; | 1343 | return ret; |
1344 | } | 1344 | } |
1345 | 1345 | ||
1346 | static int __devexit da7210_spi_remove(struct spi_device *spi) | 1346 | static int da7210_spi_remove(struct spi_device *spi) |
1347 | { | 1347 | { |
1348 | snd_soc_unregister_codec(&spi->dev); | 1348 | snd_soc_unregister_codec(&spi->dev); |
1349 | return 0; | 1349 | return 0; |
@@ -1355,7 +1355,7 @@ static struct spi_driver da7210_spi_driver = { | |||
1355 | .owner = THIS_MODULE, | 1355 | .owner = THIS_MODULE, |
1356 | }, | 1356 | }, |
1357 | .probe = da7210_spi_probe, | 1357 | .probe = da7210_spi_probe, |
1358 | .remove = __devexit_p(da7210_spi_remove) | 1358 | .remove = da7210_spi_remove |
1359 | }; | 1359 | }; |
1360 | #endif | 1360 | #endif |
1361 | 1361 | ||
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 01be2a320e21..dc0284dc9e6f 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c | |||
@@ -1557,8 +1557,8 @@ static struct snd_soc_codec_driver soc_codec_dev_da732x = { | |||
1557 | .reg_cache_size = ARRAY_SIZE(da732x_reg_cache), | 1557 | .reg_cache_size = ARRAY_SIZE(da732x_reg_cache), |
1558 | }; | 1558 | }; |
1559 | 1559 | ||
1560 | static __devinit int da732x_i2c_probe(struct i2c_client *i2c, | 1560 | static int da732x_i2c_probe(struct i2c_client *i2c, |
1561 | const struct i2c_device_id *id) | 1561 | const struct i2c_device_id *id) |
1562 | { | 1562 | { |
1563 | struct da732x_priv *da732x; | 1563 | struct da732x_priv *da732x; |
1564 | unsigned int reg; | 1564 | unsigned int reg; |
@@ -1596,7 +1596,7 @@ err: | |||
1596 | return ret; | 1596 | return ret; |
1597 | } | 1597 | } |
1598 | 1598 | ||
1599 | static __devexit int da732x_i2c_remove(struct i2c_client *client) | 1599 | static int da732x_i2c_remove(struct i2c_client *client) |
1600 | { | 1600 | { |
1601 | snd_soc_unregister_codec(&client->dev); | 1601 | snd_soc_unregister_codec(&client->dev); |
1602 | 1602 | ||
@@ -1615,7 +1615,7 @@ static struct i2c_driver da732x_i2c_driver = { | |||
1615 | .owner = THIS_MODULE, | 1615 | .owner = THIS_MODULE, |
1616 | }, | 1616 | }, |
1617 | .probe = da732x_i2c_probe, | 1617 | .probe = da732x_i2c_probe, |
1618 | .remove = __devexit_p(da732x_i2c_remove), | 1618 | .remove = da732x_i2c_remove, |
1619 | .id_table = da732x_i2c_id, | 1619 | .id_table = da732x_i2c_id, |
1620 | }; | 1620 | }; |
1621 | 1621 | ||
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index d3a6de2e757b..fc9802d1281d 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c | |||
@@ -1484,8 +1484,8 @@ static const struct regmap_config da9055_regmap_config = { | |||
1484 | .cache_type = REGCACHE_RBTREE, | 1484 | .cache_type = REGCACHE_RBTREE, |
1485 | }; | 1485 | }; |
1486 | 1486 | ||
1487 | static int __devinit da9055_i2c_probe(struct i2c_client *i2c, | 1487 | static int da9055_i2c_probe(struct i2c_client *i2c, |
1488 | const struct i2c_device_id *id) | 1488 | const struct i2c_device_id *id) |
1489 | { | 1489 | { |
1490 | struct da9055_priv *da9055; | 1490 | struct da9055_priv *da9055; |
1491 | struct da9055_platform_data *pdata = dev_get_platdata(&i2c->dev); | 1491 | struct da9055_platform_data *pdata = dev_get_platdata(&i2c->dev); |
@@ -1517,7 +1517,7 @@ static int __devinit da9055_i2c_probe(struct i2c_client *i2c, | |||
1517 | return ret; | 1517 | return ret; |
1518 | } | 1518 | } |
1519 | 1519 | ||
1520 | static int __devexit da9055_remove(struct i2c_client *client) | 1520 | static int da9055_remove(struct i2c_client *client) |
1521 | { | 1521 | { |
1522 | snd_soc_unregister_codec(&client->dev); | 1522 | snd_soc_unregister_codec(&client->dev); |
1523 | return 0; | 1523 | return 0; |
@@ -1536,7 +1536,7 @@ static struct i2c_driver da9055_i2c_driver = { | |||
1536 | .owner = THIS_MODULE, | 1536 | .owner = THIS_MODULE, |
1537 | }, | 1537 | }, |
1538 | .probe = da9055_i2c_probe, | 1538 | .probe = da9055_i2c_probe, |
1539 | .remove = __devexit_p(da9055_remove), | 1539 | .remove = da9055_remove, |
1540 | .id_table = da9055_i2c_id, | 1540 | .id_table = da9055_i2c_id, |
1541 | }; | 1541 | }; |
1542 | 1542 | ||
diff --git a/sound/soc/codecs/dfbmcs320.c b/sound/soc/codecs/dfbmcs320.c index bfe46aa90362..4f4f7f41a7d1 100644 --- a/sound/soc/codecs/dfbmcs320.c +++ b/sound/soc/codecs/dfbmcs320.c | |||
@@ -33,13 +33,13 @@ static struct snd_soc_dai_driver dfbmcs320_dai = { | |||
33 | 33 | ||
34 | static struct snd_soc_codec_driver soc_codec_dev_dfbmcs320; | 34 | static struct snd_soc_codec_driver soc_codec_dev_dfbmcs320; |
35 | 35 | ||
36 | static int __devinit dfbmcs320_probe(struct platform_device *pdev) | 36 | static int dfbmcs320_probe(struct platform_device *pdev) |
37 | { | 37 | { |
38 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_dfbmcs320, | 38 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_dfbmcs320, |
39 | &dfbmcs320_dai, 1); | 39 | &dfbmcs320_dai, 1); |
40 | } | 40 | } |
41 | 41 | ||
42 | static int __devexit dfbmcs320_remove(struct platform_device *pdev) | 42 | static int dfbmcs320_remove(struct platform_device *pdev) |
43 | { | 43 | { |
44 | snd_soc_unregister_codec(&pdev->dev); | 44 | snd_soc_unregister_codec(&pdev->dev); |
45 | 45 | ||
@@ -52,7 +52,7 @@ static struct platform_driver dfmcs320_driver = { | |||
52 | .owner = THIS_MODULE, | 52 | .owner = THIS_MODULE, |
53 | }, | 53 | }, |
54 | .probe = dfbmcs320_probe, | 54 | .probe = dfbmcs320_probe, |
55 | .remove = __devexit_p(dfbmcs320_remove), | 55 | .remove = dfbmcs320_remove, |
56 | }; | 56 | }; |
57 | 57 | ||
58 | module_platform_driver(dfmcs320_driver); | 58 | module_platform_driver(dfmcs320_driver); |
diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index 3e929f079a1f..66967ba6f757 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c | |||
@@ -66,13 +66,13 @@ static struct snd_soc_codec_driver soc_dmic = { | |||
66 | .probe = dmic_probe, | 66 | .probe = dmic_probe, |
67 | }; | 67 | }; |
68 | 68 | ||
69 | static int __devinit dmic_dev_probe(struct platform_device *pdev) | 69 | static int dmic_dev_probe(struct platform_device *pdev) |
70 | { | 70 | { |
71 | return snd_soc_register_codec(&pdev->dev, | 71 | return snd_soc_register_codec(&pdev->dev, |
72 | &soc_dmic, &dmic_dai, 1); | 72 | &soc_dmic, &dmic_dai, 1); |
73 | } | 73 | } |
74 | 74 | ||
75 | static int __devexit dmic_dev_remove(struct platform_device *pdev) | 75 | static int dmic_dev_remove(struct platform_device *pdev) |
76 | { | 76 | { |
77 | snd_soc_unregister_codec(&pdev->dev); | 77 | snd_soc_unregister_codec(&pdev->dev); |
78 | return 0; | 78 | return 0; |
@@ -86,7 +86,7 @@ static struct platform_driver dmic_driver = { | |||
86 | .owner = THIS_MODULE, | 86 | .owner = THIS_MODULE, |
87 | }, | 87 | }, |
88 | .probe = dmic_dev_probe, | 88 | .probe = dmic_dev_probe, |
89 | .remove = __devexit_p(dmic_dev_remove), | 89 | .remove = dmic_dev_remove, |
90 | }; | 90 | }; |
91 | 91 | ||
92 | module_platform_driver(dmic_driver); | 92 | module_platform_driver(dmic_driver); |
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 9ad1da36887e..d991529e1aff 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c | |||
@@ -348,7 +348,7 @@ static const struct regmap_config jz4740_codec_regmap_config = { | |||
348 | .cache_type = REGCACHE_RBTREE, | 348 | .cache_type = REGCACHE_RBTREE, |
349 | }; | 349 | }; |
350 | 350 | ||
351 | static int __devinit jz4740_codec_probe(struct platform_device *pdev) | 351 | static int jz4740_codec_probe(struct platform_device *pdev) |
352 | { | 352 | { |
353 | int ret; | 353 | int ret; |
354 | struct jz4740_codec *jz4740_codec; | 354 | struct jz4740_codec *jz4740_codec; |
@@ -380,7 +380,7 @@ static int __devinit jz4740_codec_probe(struct platform_device *pdev) | |||
380 | return ret; | 380 | return ret; |
381 | } | 381 | } |
382 | 382 | ||
383 | static int __devexit jz4740_codec_remove(struct platform_device *pdev) | 383 | static int jz4740_codec_remove(struct platform_device *pdev) |
384 | { | 384 | { |
385 | snd_soc_unregister_codec(&pdev->dev); | 385 | snd_soc_unregister_codec(&pdev->dev); |
386 | 386 | ||
@@ -391,7 +391,7 @@ static int __devexit jz4740_codec_remove(struct platform_device *pdev) | |||
391 | 391 | ||
392 | static struct platform_driver jz4740_codec_driver = { | 392 | static struct platform_driver jz4740_codec_driver = { |
393 | .probe = jz4740_codec_probe, | 393 | .probe = jz4740_codec_probe, |
394 | .remove = __devexit_p(jz4740_codec_remove), | 394 | .remove = jz4740_codec_remove, |
395 | .driver = { | 395 | .driver = { |
396 | .name = "jz4740-codec", | 396 | .name = "jz4740-codec", |
397 | .owner = THIS_MODULE, | 397 | .owner = THIS_MODULE, |
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c index 81a328c78838..9f9f59573f72 100644 --- a/sound/soc/codecs/lm4857.c +++ b/sound/soc/codecs/lm4857.c | |||
@@ -209,8 +209,8 @@ static struct snd_soc_codec_driver soc_codec_dev_lm4857 = { | |||
209 | .set_bias_level = lm4857_set_bias_level, | 209 | .set_bias_level = lm4857_set_bias_level, |
210 | }; | 210 | }; |
211 | 211 | ||
212 | static int __devinit lm4857_i2c_probe(struct i2c_client *i2c, | 212 | static int lm4857_i2c_probe(struct i2c_client *i2c, |
213 | const struct i2c_device_id *id) | 213 | const struct i2c_device_id *id) |
214 | { | 214 | { |
215 | struct lm4857 *lm4857; | 215 | struct lm4857 *lm4857; |
216 | int ret; | 216 | int ret; |
@@ -228,7 +228,7 @@ static int __devinit lm4857_i2c_probe(struct i2c_client *i2c, | |||
228 | return ret; | 228 | return ret; |
229 | } | 229 | } |
230 | 230 | ||
231 | static int __devexit lm4857_i2c_remove(struct i2c_client *i2c) | 231 | static int lm4857_i2c_remove(struct i2c_client *i2c) |
232 | { | 232 | { |
233 | snd_soc_unregister_codec(&i2c->dev); | 233 | snd_soc_unregister_codec(&i2c->dev); |
234 | return 0; | 234 | return 0; |
@@ -246,7 +246,7 @@ static struct i2c_driver lm4857_i2c_driver = { | |||
246 | .owner = THIS_MODULE, | 246 | .owner = THIS_MODULE, |
247 | }, | 247 | }, |
248 | .probe = lm4857_i2c_probe, | 248 | .probe = lm4857_i2c_probe, |
249 | .remove = __devexit_p(lm4857_i2c_remove), | 249 | .remove = lm4857_i2c_remove, |
250 | .id_table = lm4857_i2c_id, | 250 | .id_table = lm4857_i2c_id, |
251 | }; | 251 | }; |
252 | 252 | ||
diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c index a777de6a1b23..a6ac2313047d 100644 --- a/sound/soc/codecs/max9768.c +++ b/sound/soc/codecs/max9768.c | |||
@@ -159,8 +159,8 @@ static const struct regmap_config max9768_i2c_regmap_config = { | |||
159 | .cache_type = REGCACHE_RBTREE, | 159 | .cache_type = REGCACHE_RBTREE, |
160 | }; | 160 | }; |
161 | 161 | ||
162 | static int __devinit max9768_i2c_probe(struct i2c_client *client, | 162 | static int max9768_i2c_probe(struct i2c_client *client, |
163 | const struct i2c_device_id *id) | 163 | const struct i2c_device_id *id) |
164 | { | 164 | { |
165 | struct max9768 *max9768; | 165 | struct max9768 *max9768; |
166 | struct max9768_pdata *pdata = client->dev.platform_data; | 166 | struct max9768_pdata *pdata = client->dev.platform_data; |
@@ -208,7 +208,7 @@ static int __devinit max9768_i2c_probe(struct i2c_client *client, | |||
208 | return err; | 208 | return err; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int __devexit max9768_i2c_remove(struct i2c_client *client) | 211 | static int max9768_i2c_remove(struct i2c_client *client) |
212 | { | 212 | { |
213 | struct max9768 *max9768 = i2c_get_clientdata(client); | 213 | struct max9768 *max9768 = i2c_get_clientdata(client); |
214 | 214 | ||
@@ -234,7 +234,7 @@ static struct i2c_driver max9768_i2c_driver = { | |||
234 | .owner = THIS_MODULE, | 234 | .owner = THIS_MODULE, |
235 | }, | 235 | }, |
236 | .probe = max9768_i2c_probe, | 236 | .probe = max9768_i2c_probe, |
237 | .remove = __devexit_p(max9768_i2c_remove), | 237 | .remove = max9768_i2c_remove, |
238 | .id_table = max9768_i2c_id, | 238 | .id_table = max9768_i2c_id, |
239 | }; | 239 | }; |
240 | module_i2c_driver(max9768_i2c_driver); | 240 | module_i2c_driver(max9768_i2c_driver); |
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index b858264235c4..a4c16fd70f77 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c | |||
@@ -2084,7 +2084,7 @@ static int max98088_i2c_probe(struct i2c_client *i2c, | |||
2084 | return ret; | 2084 | return ret; |
2085 | } | 2085 | } |
2086 | 2086 | ||
2087 | static int __devexit max98088_i2c_remove(struct i2c_client *client) | 2087 | static int max98088_i2c_remove(struct i2c_client *client) |
2088 | { | 2088 | { |
2089 | snd_soc_unregister_codec(&client->dev); | 2089 | snd_soc_unregister_codec(&client->dev); |
2090 | return 0; | 2090 | return 0; |
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 38d43c59d3f4..41cdd1642970 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c | |||
@@ -2511,7 +2511,7 @@ static int max98095_i2c_probe(struct i2c_client *i2c, | |||
2511 | return ret; | 2511 | return ret; |
2512 | } | 2512 | } |
2513 | 2513 | ||
2514 | static int __devexit max98095_i2c_remove(struct i2c_client *client) | 2514 | static int max98095_i2c_remove(struct i2c_client *client) |
2515 | { | 2515 | { |
2516 | snd_soc_unregister_codec(&client->dev); | 2516 | snd_soc_unregister_codec(&client->dev); |
2517 | return 0; | 2517 | return 0; |
@@ -2529,7 +2529,7 @@ static struct i2c_driver max98095_i2c_driver = { | |||
2529 | .owner = THIS_MODULE, | 2529 | .owner = THIS_MODULE, |
2530 | }, | 2530 | }, |
2531 | .probe = max98095_i2c_probe, | 2531 | .probe = max98095_i2c_probe, |
2532 | .remove = __devexit_p(max98095_i2c_remove), | 2532 | .remove = max98095_i2c_remove, |
2533 | .id_table = max98095_i2c_id, | 2533 | .id_table = max98095_i2c_id, |
2534 | }; | 2534 | }; |
2535 | 2535 | ||
diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index efe535c37b39..58c38a5b481c 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c | |||
@@ -329,8 +329,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max9850 = { | |||
329 | .num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes), | 329 | .num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes), |
330 | }; | 330 | }; |
331 | 331 | ||
332 | static int __devinit max9850_i2c_probe(struct i2c_client *i2c, | 332 | static int max9850_i2c_probe(struct i2c_client *i2c, |
333 | const struct i2c_device_id *id) | 333 | const struct i2c_device_id *id) |
334 | { | 334 | { |
335 | struct max9850_priv *max9850; | 335 | struct max9850_priv *max9850; |
336 | int ret; | 336 | int ret; |
@@ -347,7 +347,7 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c, | |||
347 | return ret; | 347 | return ret; |
348 | } | 348 | } |
349 | 349 | ||
350 | static __devexit int max9850_i2c_remove(struct i2c_client *client) | 350 | static int max9850_i2c_remove(struct i2c_client *client) |
351 | { | 351 | { |
352 | snd_soc_unregister_codec(&client->dev); | 352 | snd_soc_unregister_codec(&client->dev); |
353 | return 0; | 353 | return 0; |
@@ -365,7 +365,7 @@ static struct i2c_driver max9850_i2c_driver = { | |||
365 | .owner = THIS_MODULE, | 365 | .owner = THIS_MODULE, |
366 | }, | 366 | }, |
367 | .probe = max9850_i2c_probe, | 367 | .probe = max9850_i2c_probe, |
368 | .remove = __devexit_p(max9850_i2c_remove), | 368 | .remove = max9850_i2c_remove, |
369 | .id_table = max9850_i2c_id, | 369 | .id_table = max9850_i2c_id, |
370 | }; | 370 | }; |
371 | 371 | ||
diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c index d15e5943c85e..6b6c74cd83e2 100644 --- a/sound/soc/codecs/max9877.c +++ b/sound/soc/codecs/max9877.c | |||
@@ -258,8 +258,8 @@ int max9877_add_controls(struct snd_soc_codec *codec) | |||
258 | } | 258 | } |
259 | EXPORT_SYMBOL_GPL(max9877_add_controls); | 259 | EXPORT_SYMBOL_GPL(max9877_add_controls); |
260 | 260 | ||
261 | static int __devinit max9877_i2c_probe(struct i2c_client *client, | 261 | static int max9877_i2c_probe(struct i2c_client *client, |
262 | const struct i2c_device_id *id) | 262 | const struct i2c_device_id *id) |
263 | { | 263 | { |
264 | i2c = client; | 264 | i2c = client; |
265 | 265 | ||
@@ -268,7 +268,7 @@ static int __devinit max9877_i2c_probe(struct i2c_client *client, | |||
268 | return 0; | 268 | return 0; |
269 | } | 269 | } |
270 | 270 | ||
271 | static __devexit int max9877_i2c_remove(struct i2c_client *client) | 271 | static int max9877_i2c_remove(struct i2c_client *client) |
272 | { | 272 | { |
273 | i2c = NULL; | 273 | i2c = NULL; |
274 | 274 | ||
@@ -287,7 +287,7 @@ static struct i2c_driver max9877_i2c_driver = { | |||
287 | .owner = THIS_MODULE, | 287 | .owner = THIS_MODULE, |
288 | }, | 288 | }, |
289 | .probe = max9877_i2c_probe, | 289 | .probe = max9877_i2c_probe, |
290 | .remove = __devexit_p(max9877_i2c_remove), | 290 | .remove = max9877_i2c_remove, |
291 | .id_table = max9877_i2c_id, | 291 | .id_table = max9877_i2c_id, |
292 | }; | 292 | }; |
293 | 293 | ||
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index bc955999c8aa..5402dfbbb716 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c | |||
@@ -779,7 +779,7 @@ static struct platform_driver mc13783_codec_driver = { | |||
779 | .owner = THIS_MODULE, | 779 | .owner = THIS_MODULE, |
780 | }, | 780 | }, |
781 | .probe = mc13783_codec_probe, | 781 | .probe = mc13783_codec_probe, |
782 | .remove = __devexit_p(mc13783_codec_remove), | 782 | .remove = mc13783_codec_remove, |
783 | }; | 783 | }; |
784 | 784 | ||
785 | module_platform_driver(mc13783_codec_driver); | 785 | module_platform_driver(mc13783_codec_driver); |
diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c index 96aa5fa05160..26118828782b 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c | |||
@@ -626,8 +626,8 @@ static const struct regmap_config ml26124_i2c_regmap = { | |||
626 | .write_flag_mask = 0x01, | 626 | .write_flag_mask = 0x01, |
627 | }; | 627 | }; |
628 | 628 | ||
629 | static __devinit int ml26124_i2c_probe(struct i2c_client *i2c, | 629 | static int ml26124_i2c_probe(struct i2c_client *i2c, |
630 | const struct i2c_device_id *id) | 630 | const struct i2c_device_id *id) |
631 | { | 631 | { |
632 | struct ml26124_priv *priv; | 632 | struct ml26124_priv *priv; |
633 | int ret; | 633 | int ret; |
@@ -649,7 +649,7 @@ static __devinit int ml26124_i2c_probe(struct i2c_client *i2c, | |||
649 | &soc_codec_dev_ml26124, &ml26124_dai, 1); | 649 | &soc_codec_dev_ml26124, &ml26124_dai, 1); |
650 | } | 650 | } |
651 | 651 | ||
652 | static __devexit int ml26124_i2c_remove(struct i2c_client *client) | 652 | static int ml26124_i2c_remove(struct i2c_client *client) |
653 | { | 653 | { |
654 | snd_soc_unregister_codec(&client->dev); | 654 | snd_soc_unregister_codec(&client->dev); |
655 | return 0; | 655 | return 0; |
@@ -667,7 +667,7 @@ static struct i2c_driver ml26124_i2c_driver = { | |||
667 | .owner = THIS_MODULE, | 667 | .owner = THIS_MODULE, |
668 | }, | 668 | }, |
669 | .probe = ml26124_i2c_probe, | 669 | .probe = ml26124_i2c_probe, |
670 | .remove = __devexit_p(ml26124_i2c_remove), | 670 | .remove = ml26124_i2c_remove, |
671 | .id_table = ml26124_i2c_id, | 671 | .id_table = ml26124_i2c_id, |
672 | }; | 672 | }; |
673 | 673 | ||
diff --git a/sound/soc/codecs/omap-hdmi.c b/sound/soc/codecs/omap-hdmi.c index 1bf5c74f5f96..529d06444c54 100644 --- a/sound/soc/codecs/omap-hdmi.c +++ b/sound/soc/codecs/omap-hdmi.c | |||
@@ -39,13 +39,13 @@ static struct snd_soc_dai_driver omap_hdmi_codec_dai = { | |||
39 | }, | 39 | }, |
40 | }; | 40 | }; |
41 | 41 | ||
42 | static __devinit int omap_hdmi_codec_probe(struct platform_device *pdev) | 42 | static int omap_hdmi_codec_probe(struct platform_device *pdev) |
43 | { | 43 | { |
44 | return snd_soc_register_codec(&pdev->dev, &omap_hdmi_codec, | 44 | return snd_soc_register_codec(&pdev->dev, &omap_hdmi_codec, |
45 | &omap_hdmi_codec_dai, 1); | 45 | &omap_hdmi_codec_dai, 1); |
46 | } | 46 | } |
47 | 47 | ||
48 | static __devexit int omap_hdmi_codec_remove(struct platform_device *pdev) | 48 | static int omap_hdmi_codec_remove(struct platform_device *pdev) |
49 | { | 49 | { |
50 | snd_soc_unregister_codec(&pdev->dev); | 50 | snd_soc_unregister_codec(&pdev->dev); |
51 | return 0; | 51 | return 0; |
@@ -58,7 +58,7 @@ static struct platform_driver omap_hdmi_codec_driver = { | |||
58 | }, | 58 | }, |
59 | 59 | ||
60 | .probe = omap_hdmi_codec_probe, | 60 | .probe = omap_hdmi_codec_probe, |
61 | .remove = __devexit_p(omap_hdmi_codec_remove), | 61 | .remove = omap_hdmi_codec_remove, |
62 | }; | 62 | }; |
63 | 63 | ||
64 | module_platform_driver(omap_hdmi_codec_driver); | 64 | module_platform_driver(omap_hdmi_codec_driver); |
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c index edcaa7ea5487..f2a6282b41f4 100644 --- a/sound/soc/codecs/pcm3008.c +++ b/sound/soc/codecs/pcm3008.c | |||
@@ -149,13 +149,13 @@ static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = { | |||
149 | .resume = pcm3008_soc_resume, | 149 | .resume = pcm3008_soc_resume, |
150 | }; | 150 | }; |
151 | 151 | ||
152 | static int __devinit pcm3008_codec_probe(struct platform_device *pdev) | 152 | static int pcm3008_codec_probe(struct platform_device *pdev) |
153 | { | 153 | { |
154 | return snd_soc_register_codec(&pdev->dev, | 154 | return snd_soc_register_codec(&pdev->dev, |
155 | &soc_codec_dev_pcm3008, &pcm3008_dai, 1); | 155 | &soc_codec_dev_pcm3008, &pcm3008_dai, 1); |
156 | } | 156 | } |
157 | 157 | ||
158 | static int __devexit pcm3008_codec_remove(struct platform_device *pdev) | 158 | static int pcm3008_codec_remove(struct platform_device *pdev) |
159 | { | 159 | { |
160 | snd_soc_unregister_codec(&pdev->dev); | 160 | snd_soc_unregister_codec(&pdev->dev); |
161 | return 0; | 161 | return 0; |
@@ -165,7 +165,7 @@ MODULE_ALIAS("platform:pcm3008-codec"); | |||
165 | 165 | ||
166 | static struct platform_driver pcm3008_codec_driver = { | 166 | static struct platform_driver pcm3008_codec_driver = { |
167 | .probe = pcm3008_codec_probe, | 167 | .probe = pcm3008_codec_probe, |
168 | .remove = __devexit_p(pcm3008_codec_remove), | 168 | .remove = pcm3008_codec_remove, |
169 | .driver = { | 169 | .driver = { |
170 | .name = "pcm3008-codec", | 170 | .name = "pcm3008-codec", |
171 | .owner = THIS_MODULE, | 171 | .owner = THIS_MODULE, |
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index d6ca615489ee..912c9cbc2724 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c | |||
@@ -1748,7 +1748,7 @@ static int rt5631_i2c_probe(struct i2c_client *i2c, | |||
1748 | return ret; | 1748 | return ret; |
1749 | } | 1749 | } |
1750 | 1750 | ||
1751 | static __devexit int rt5631_i2c_remove(struct i2c_client *client) | 1751 | static int rt5631_i2c_remove(struct i2c_client *client) |
1752 | { | 1752 | { |
1753 | snd_soc_unregister_codec(&client->dev); | 1753 | snd_soc_unregister_codec(&client->dev); |
1754 | return 0; | 1754 | return 0; |
@@ -1760,7 +1760,7 @@ static struct i2c_driver rt5631_i2c_driver = { | |||
1760 | .owner = THIS_MODULE, | 1760 | .owner = THIS_MODULE, |
1761 | }, | 1761 | }, |
1762 | .probe = rt5631_i2c_probe, | 1762 | .probe = rt5631_i2c_probe, |
1763 | .remove = __devexit_p(rt5631_i2c_remove), | 1763 | .remove = rt5631_i2c_remove, |
1764 | .id_table = rt5631_i2c_id, | 1764 | .id_table = rt5631_i2c_id, |
1765 | }; | 1765 | }; |
1766 | 1766 | ||
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index df2f99d1d428..cb1675cd8e1c 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c | |||
@@ -1404,8 +1404,8 @@ static struct snd_soc_codec_driver sgtl5000_driver = { | |||
1404 | .num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes), | 1404 | .num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes), |
1405 | }; | 1405 | }; |
1406 | 1406 | ||
1407 | static __devinit int sgtl5000_i2c_probe(struct i2c_client *client, | 1407 | static int sgtl5000_i2c_probe(struct i2c_client *client, |
1408 | const struct i2c_device_id *id) | 1408 | const struct i2c_device_id *id) |
1409 | { | 1409 | { |
1410 | struct sgtl5000_priv *sgtl5000; | 1410 | struct sgtl5000_priv *sgtl5000; |
1411 | int ret; | 1411 | int ret; |
@@ -1422,7 +1422,7 @@ static __devinit int sgtl5000_i2c_probe(struct i2c_client *client, | |||
1422 | return ret; | 1422 | return ret; |
1423 | } | 1423 | } |
1424 | 1424 | ||
1425 | static __devexit int sgtl5000_i2c_remove(struct i2c_client *client) | 1425 | static int sgtl5000_i2c_remove(struct i2c_client *client) |
1426 | { | 1426 | { |
1427 | snd_soc_unregister_codec(&client->dev); | 1427 | snd_soc_unregister_codec(&client->dev); |
1428 | 1428 | ||
@@ -1449,7 +1449,7 @@ static struct i2c_driver sgtl5000_i2c_driver = { | |||
1449 | .of_match_table = sgtl5000_dt_ids, | 1449 | .of_match_table = sgtl5000_dt_ids, |
1450 | }, | 1450 | }, |
1451 | .probe = sgtl5000_i2c_probe, | 1451 | .probe = sgtl5000_i2c_probe, |
1452 | .remove = __devexit_p(sgtl5000_i2c_remove), | 1452 | .remove = sgtl5000_i2c_remove, |
1453 | .id_table = sgtl5000_id, | 1453 | .id_table = sgtl5000_id, |
1454 | }; | 1454 | }; |
1455 | 1455 | ||
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index 38145ba74db8..f2d61a187830 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c | |||
@@ -226,13 +226,13 @@ static struct snd_soc_codec_driver soc_codec_dev_si476x = { | |||
226 | .write = si476x_codec_write, | 226 | .write = si476x_codec_write, |
227 | }; | 227 | }; |
228 | 228 | ||
229 | static int __devinit si476x_platform_probe(struct platform_device *pdev) | 229 | static int si476x_platform_probe(struct platform_device *pdev) |
230 | { | 230 | { |
231 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_si476x, | 231 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_si476x, |
232 | &si476x_dai, 1); | 232 | &si476x_dai, 1); |
233 | } | 233 | } |
234 | 234 | ||
235 | static int __devexit si476x_platform_remove(struct platform_device *pdev) | 235 | static int si476x_platform_remove(struct platform_device *pdev) |
236 | { | 236 | { |
237 | snd_soc_unregister_codec(&pdev->dev); | 237 | snd_soc_unregister_codec(&pdev->dev); |
238 | return 0; | 238 | return 0; |
@@ -246,7 +246,7 @@ static struct platform_driver si476x_platform_driver = { | |||
246 | .owner = THIS_MODULE, | 246 | .owner = THIS_MODULE, |
247 | }, | 247 | }, |
248 | .probe = si476x_platform_probe, | 248 | .probe = si476x_platform_probe, |
249 | .remove = __devexit_p(si476x_platform_remove), | 249 | .remove = si476x_platform_remove, |
250 | }; | 250 | }; |
251 | module_platform_driver(si476x_platform_driver); | 251 | module_platform_driver(si476x_platform_driver); |
252 | 252 | ||
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index 50dbdb9357ea..d1ae869d3181 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c | |||
@@ -896,14 +896,14 @@ struct snd_soc_codec_driver sn95031_codec = { | |||
896 | .num_dapm_routes = ARRAY_SIZE(sn95031_audio_map), | 896 | .num_dapm_routes = ARRAY_SIZE(sn95031_audio_map), |
897 | }; | 897 | }; |
898 | 898 | ||
899 | static int __devinit sn95031_device_probe(struct platform_device *pdev) | 899 | static int sn95031_device_probe(struct platform_device *pdev) |
900 | { | 900 | { |
901 | pr_debug("codec device probe called for %s\n", dev_name(&pdev->dev)); | 901 | pr_debug("codec device probe called for %s\n", dev_name(&pdev->dev)); |
902 | return snd_soc_register_codec(&pdev->dev, &sn95031_codec, | 902 | return snd_soc_register_codec(&pdev->dev, &sn95031_codec, |
903 | sn95031_dais, ARRAY_SIZE(sn95031_dais)); | 903 | sn95031_dais, ARRAY_SIZE(sn95031_dais)); |
904 | } | 904 | } |
905 | 905 | ||
906 | static int __devexit sn95031_device_remove(struct platform_device *pdev) | 906 | static int sn95031_device_remove(struct platform_device *pdev) |
907 | { | 907 | { |
908 | pr_debug("codec device remove called\n"); | 908 | pr_debug("codec device remove called\n"); |
909 | snd_soc_unregister_codec(&pdev->dev); | 909 | snd_soc_unregister_codec(&pdev->dev); |
@@ -916,7 +916,7 @@ static struct platform_driver sn95031_codec_driver = { | |||
916 | .owner = THIS_MODULE, | 916 | .owner = THIS_MODULE, |
917 | }, | 917 | }, |
918 | .probe = sn95031_device_probe, | 918 | .probe = sn95031_device_probe, |
919 | .remove = __devexit_p(sn95031_device_remove), | 919 | .remove = sn95031_device_remove, |
920 | }; | 920 | }; |
921 | 921 | ||
922 | module_platform_driver(sn95031_codec_driver); | 922 | module_platform_driver(sn95031_codec_driver); |
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 079066fef425..f8d30e5f6371 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -691,7 +691,7 @@ static const struct regmap_config ssm2602_regmap_config = { | |||
691 | }; | 691 | }; |
692 | 692 | ||
693 | #if defined(CONFIG_SPI_MASTER) | 693 | #if defined(CONFIG_SPI_MASTER) |
694 | static int __devinit ssm2602_spi_probe(struct spi_device *spi) | 694 | static int ssm2602_spi_probe(struct spi_device *spi) |
695 | { | 695 | { |
696 | struct ssm2602_priv *ssm2602; | 696 | struct ssm2602_priv *ssm2602; |
697 | int ret; | 697 | int ret; |
@@ -713,7 +713,7 @@ static int __devinit ssm2602_spi_probe(struct spi_device *spi) | |||
713 | return ret; | 713 | return ret; |
714 | } | 714 | } |
715 | 715 | ||
716 | static int __devexit ssm2602_spi_remove(struct spi_device *spi) | 716 | static int ssm2602_spi_remove(struct spi_device *spi) |
717 | { | 717 | { |
718 | snd_soc_unregister_codec(&spi->dev); | 718 | snd_soc_unregister_codec(&spi->dev); |
719 | return 0; | 719 | return 0; |
@@ -725,7 +725,7 @@ static struct spi_driver ssm2602_spi_driver = { | |||
725 | .owner = THIS_MODULE, | 725 | .owner = THIS_MODULE, |
726 | }, | 726 | }, |
727 | .probe = ssm2602_spi_probe, | 727 | .probe = ssm2602_spi_probe, |
728 | .remove = __devexit_p(ssm2602_spi_remove), | 728 | .remove = ssm2602_spi_remove, |
729 | }; | 729 | }; |
730 | #endif | 730 | #endif |
731 | 731 | ||
@@ -736,7 +736,7 @@ static struct spi_driver ssm2602_spi_driver = { | |||
736 | * low = 0x1a | 736 | * low = 0x1a |
737 | * high = 0x1b | 737 | * high = 0x1b |
738 | */ | 738 | */ |
739 | static int __devinit ssm2602_i2c_probe(struct i2c_client *i2c, | 739 | static int ssm2602_i2c_probe(struct i2c_client *i2c, |
740 | const struct i2c_device_id *id) | 740 | const struct i2c_device_id *id) |
741 | { | 741 | { |
742 | struct ssm2602_priv *ssm2602; | 742 | struct ssm2602_priv *ssm2602; |
@@ -759,7 +759,7 @@ static int __devinit ssm2602_i2c_probe(struct i2c_client *i2c, | |||
759 | return ret; | 759 | return ret; |
760 | } | 760 | } |
761 | 761 | ||
762 | static int __devexit ssm2602_i2c_remove(struct i2c_client *client) | 762 | static int ssm2602_i2c_remove(struct i2c_client *client) |
763 | { | 763 | { |
764 | snd_soc_unregister_codec(&client->dev); | 764 | snd_soc_unregister_codec(&client->dev); |
765 | return 0; | 765 | return 0; |
@@ -780,7 +780,7 @@ static struct i2c_driver ssm2602_i2c_driver = { | |||
780 | .owner = THIS_MODULE, | 780 | .owner = THIS_MODULE, |
781 | }, | 781 | }, |
782 | .probe = ssm2602_i2c_probe, | 782 | .probe = ssm2602_i2c_probe, |
783 | .remove = __devexit_p(ssm2602_i2c_remove), | 783 | .remove = ssm2602_i2c_remove, |
784 | .id_table = ssm2602_i2c_id, | 784 | .id_table = ssm2602_i2c_id, |
785 | }; | 785 | }; |
786 | #endif | 786 | #endif |
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 0935bfe62471..cfb55fe35e98 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c | |||
@@ -995,8 +995,8 @@ static const struct regmap_config sta32x_regmap = { | |||
995 | .volatile_reg = sta32x_reg_is_volatile, | 995 | .volatile_reg = sta32x_reg_is_volatile, |
996 | }; | 996 | }; |
997 | 997 | ||
998 | static __devinit int sta32x_i2c_probe(struct i2c_client *i2c, | 998 | static int sta32x_i2c_probe(struct i2c_client *i2c, |
999 | const struct i2c_device_id *id) | 999 | const struct i2c_device_id *id) |
1000 | { | 1000 | { |
1001 | struct sta32x_priv *sta32x; | 1001 | struct sta32x_priv *sta32x; |
1002 | int ret, i; | 1002 | int ret, i; |
@@ -1033,7 +1033,7 @@ static __devinit int sta32x_i2c_probe(struct i2c_client *i2c, | |||
1033 | return ret; | 1033 | return ret; |
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | static __devexit int sta32x_i2c_remove(struct i2c_client *client) | 1036 | static int sta32x_i2c_remove(struct i2c_client *client) |
1037 | { | 1037 | { |
1038 | snd_soc_unregister_codec(&client->dev); | 1038 | snd_soc_unregister_codec(&client->dev); |
1039 | return 0; | 1039 | return 0; |
@@ -1053,7 +1053,7 @@ static struct i2c_driver sta32x_i2c_driver = { | |||
1053 | .owner = THIS_MODULE, | 1053 | .owner = THIS_MODULE, |
1054 | }, | 1054 | }, |
1055 | .probe = sta32x_i2c_probe, | 1055 | .probe = sta32x_i2c_probe, |
1056 | .remove = __devexit_p(sta32x_i2c_remove), | 1056 | .remove = sta32x_i2c_remove, |
1057 | .id_table = sta32x_i2c_id, | 1057 | .id_table = sta32x_i2c_id, |
1058 | }; | 1058 | }; |
1059 | 1059 | ||
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c index 9e3144862386..ab355c4f0b2d 100644 --- a/sound/soc/codecs/sta529.c +++ b/sound/soc/codecs/sta529.c | |||
@@ -380,8 +380,8 @@ static const struct regmap_config sta529_regmap = { | |||
380 | .num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults), | 380 | .num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults), |
381 | }; | 381 | }; |
382 | 382 | ||
383 | static __devinit int sta529_i2c_probe(struct i2c_client *i2c, | 383 | static int sta529_i2c_probe(struct i2c_client *i2c, |
384 | const struct i2c_device_id *id) | 384 | const struct i2c_device_id *id) |
385 | { | 385 | { |
386 | struct sta529 *sta529; | 386 | struct sta529 *sta529; |
387 | int ret; | 387 | int ret; |
@@ -412,7 +412,7 @@ static __devinit int sta529_i2c_probe(struct i2c_client *i2c, | |||
412 | return ret; | 412 | return ret; |
413 | } | 413 | } |
414 | 414 | ||
415 | static int __devexit sta529_i2c_remove(struct i2c_client *client) | 415 | static int sta529_i2c_remove(struct i2c_client *client) |
416 | { | 416 | { |
417 | snd_soc_unregister_codec(&client->dev); | 417 | snd_soc_unregister_codec(&client->dev); |
418 | 418 | ||
@@ -431,7 +431,7 @@ static struct i2c_driver sta529_i2c_driver = { | |||
431 | .owner = THIS_MODULE, | 431 | .owner = THIS_MODULE, |
432 | }, | 432 | }, |
433 | .probe = sta529_i2c_probe, | 433 | .probe = sta529_i2c_probe, |
434 | .remove = __devexit_p(sta529_i2c_remove), | 434 | .remove = sta529_i2c_remove, |
435 | .id_table = sta529_i2c_id, | 435 | .id_table = sta529_i2c_id, |
436 | }; | 436 | }; |
437 | 437 | ||
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 982e437799a8..2eda85ba79ac 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c | |||
@@ -385,13 +385,13 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = { | |||
385 | .reg_cache_default = stac9766_reg, | 385 | .reg_cache_default = stac9766_reg, |
386 | }; | 386 | }; |
387 | 387 | ||
388 | static __devinit int stac9766_probe(struct platform_device *pdev) | 388 | static int stac9766_probe(struct platform_device *pdev) |
389 | { | 389 | { |
390 | return snd_soc_register_codec(&pdev->dev, | 390 | return snd_soc_register_codec(&pdev->dev, |
391 | &soc_codec_dev_stac9766, stac9766_dai, ARRAY_SIZE(stac9766_dai)); | 391 | &soc_codec_dev_stac9766, stac9766_dai, ARRAY_SIZE(stac9766_dai)); |
392 | } | 392 | } |
393 | 393 | ||
394 | static int __devexit stac9766_remove(struct platform_device *pdev) | 394 | static int stac9766_remove(struct platform_device *pdev) |
395 | { | 395 | { |
396 | snd_soc_unregister_codec(&pdev->dev); | 396 | snd_soc_unregister_codec(&pdev->dev); |
397 | return 0; | 397 | return 0; |
@@ -404,7 +404,7 @@ static struct platform_driver stac9766_codec_driver = { | |||
404 | }, | 404 | }, |
405 | 405 | ||
406 | .probe = stac9766_probe, | 406 | .probe = stac9766_probe, |
407 | .remove = __devexit_p(stac9766_remove), | 407 | .remove = stac9766_remove, |
408 | }; | 408 | }; |
409 | 409 | ||
410 | module_platform_driver(stac9766_codec_driver); | 410 | module_platform_driver(stac9766_codec_driver); |
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index e39e08d5d8e4..17df4e32feac 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c | |||
@@ -716,8 +716,8 @@ static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = { | |||
716 | .set_bias_level = aic32x4_set_bias_level, | 716 | .set_bias_level = aic32x4_set_bias_level, |
717 | }; | 717 | }; |
718 | 718 | ||
719 | static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c, | 719 | static int aic32x4_i2c_probe(struct i2c_client *i2c, |
720 | const struct i2c_device_id *id) | 720 | const struct i2c_device_id *id) |
721 | { | 721 | { |
722 | struct aic32x4_pdata *pdata = i2c->dev.platform_data; | 722 | struct aic32x4_pdata *pdata = i2c->dev.platform_data; |
723 | struct aic32x4_priv *aic32x4; | 723 | struct aic32x4_priv *aic32x4; |
@@ -748,7 +748,7 @@ static __devinit int aic32x4_i2c_probe(struct i2c_client *i2c, | |||
748 | return ret; | 748 | return ret; |
749 | } | 749 | } |
750 | 750 | ||
751 | static __devexit int aic32x4_i2c_remove(struct i2c_client *client) | 751 | static int aic32x4_i2c_remove(struct i2c_client *client) |
752 | { | 752 | { |
753 | snd_soc_unregister_codec(&client->dev); | 753 | snd_soc_unregister_codec(&client->dev); |
754 | return 0; | 754 | return 0; |
@@ -766,7 +766,7 @@ static struct i2c_driver aic32x4_i2c_driver = { | |||
766 | .owner = THIS_MODULE, | 766 | .owner = THIS_MODULE, |
767 | }, | 767 | }, |
768 | .probe = aic32x4_i2c_probe, | 768 | .probe = aic32x4_i2c_probe, |
769 | .remove = __devexit_p(aic32x4_i2c_remove), | 769 | .remove = aic32x4_i2c_remove, |
770 | .id_table = aic32x4_i2c_id, | 770 | .id_table = aic32x4_i2c_id, |
771 | }; | 771 | }; |
772 | 772 | ||
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index d2e16c5d7d1f..782b0cded2e6 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c | |||
@@ -1514,8 +1514,8 @@ static struct snd_soc_dai_driver dac33_dai = { | |||
1514 | .ops = &dac33_dai_ops, | 1514 | .ops = &dac33_dai_ops, |
1515 | }; | 1515 | }; |
1516 | 1516 | ||
1517 | static int __devinit dac33_i2c_probe(struct i2c_client *client, | 1517 | static int dac33_i2c_probe(struct i2c_client *client, |
1518 | const struct i2c_device_id *id) | 1518 | const struct i2c_device_id *id) |
1519 | { | 1519 | { |
1520 | struct tlv320dac33_platform_data *pdata; | 1520 | struct tlv320dac33_platform_data *pdata; |
1521 | struct tlv320dac33_priv *dac33; | 1521 | struct tlv320dac33_priv *dac33; |
@@ -1586,7 +1586,7 @@ err_gpio: | |||
1586 | return ret; | 1586 | return ret; |
1587 | } | 1587 | } |
1588 | 1588 | ||
1589 | static int __devexit dac33_i2c_remove(struct i2c_client *client) | 1589 | static int dac33_i2c_remove(struct i2c_client *client) |
1590 | { | 1590 | { |
1591 | struct tlv320dac33_priv *dac33 = i2c_get_clientdata(client); | 1591 | struct tlv320dac33_priv *dac33 = i2c_get_clientdata(client); |
1592 | 1592 | ||
@@ -1617,7 +1617,7 @@ static struct i2c_driver tlv320dac33_i2c_driver = { | |||
1617 | .owner = THIS_MODULE, | 1617 | .owner = THIS_MODULE, |
1618 | }, | 1618 | }, |
1619 | .probe = dac33_i2c_probe, | 1619 | .probe = dac33_i2c_probe, |
1620 | .remove = __devexit_p(dac33_i2c_remove), | 1620 | .remove = dac33_i2c_remove, |
1621 | .id_table = tlv320dac33_i2c_id, | 1621 | .id_table = tlv320dac33_i2c_id, |
1622 | }; | 1622 | }; |
1623 | 1623 | ||
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c index 565ff39ad3a3..8d75aa152c8c 100644 --- a/sound/soc/codecs/tpa6130a2.c +++ b/sound/soc/codecs/tpa6130a2.c | |||
@@ -359,8 +359,8 @@ int tpa6130a2_add_controls(struct snd_soc_codec *codec) | |||
359 | } | 359 | } |
360 | EXPORT_SYMBOL_GPL(tpa6130a2_add_controls); | 360 | EXPORT_SYMBOL_GPL(tpa6130a2_add_controls); |
361 | 361 | ||
362 | static int __devinit tpa6130a2_probe(struct i2c_client *client, | 362 | static int tpa6130a2_probe(struct i2c_client *client, |
363 | const struct i2c_device_id *id) | 363 | const struct i2c_device_id *id) |
364 | { | 364 | { |
365 | struct device *dev; | 365 | struct device *dev; |
366 | struct tpa6130a2_data *data; | 366 | struct tpa6130a2_data *data; |
@@ -455,7 +455,7 @@ err_gpio: | |||
455 | return ret; | 455 | return ret; |
456 | } | 456 | } |
457 | 457 | ||
458 | static int __devexit tpa6130a2_remove(struct i2c_client *client) | 458 | static int tpa6130a2_remove(struct i2c_client *client) |
459 | { | 459 | { |
460 | struct tpa6130a2_data *data = i2c_get_clientdata(client); | 460 | struct tpa6130a2_data *data = i2c_get_clientdata(client); |
461 | 461 | ||
@@ -483,7 +483,7 @@ static struct i2c_driver tpa6130a2_i2c_driver = { | |||
483 | .owner = THIS_MODULE, | 483 | .owner = THIS_MODULE, |
484 | }, | 484 | }, |
485 | .probe = tpa6130a2_probe, | 485 | .probe = tpa6130a2_probe, |
486 | .remove = __devexit_p(tpa6130a2_remove), | 486 | .remove = tpa6130a2_remove, |
487 | .id_table = tpa6130a2_id, | 487 | .id_table = tpa6130a2_id, |
488 | }; | 488 | }; |
489 | 489 | ||
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 00b85cc1b9a3..3fc3fc64dd8b 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c | |||
@@ -1229,13 +1229,13 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = { | |||
1229 | .num_dapm_routes = ARRAY_SIZE(intercon), | 1229 | .num_dapm_routes = ARRAY_SIZE(intercon), |
1230 | }; | 1230 | }; |
1231 | 1231 | ||
1232 | static int __devinit twl6040_codec_probe(struct platform_device *pdev) | 1232 | static int twl6040_codec_probe(struct platform_device *pdev) |
1233 | { | 1233 | { |
1234 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl6040, | 1234 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl6040, |
1235 | twl6040_dai, ARRAY_SIZE(twl6040_dai)); | 1235 | twl6040_dai, ARRAY_SIZE(twl6040_dai)); |
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | static int __devexit twl6040_codec_remove(struct platform_device *pdev) | 1238 | static int twl6040_codec_remove(struct platform_device *pdev) |
1239 | { | 1239 | { |
1240 | snd_soc_unregister_codec(&pdev->dev); | 1240 | snd_soc_unregister_codec(&pdev->dev); |
1241 | return 0; | 1241 | return 0; |
@@ -1247,7 +1247,7 @@ static struct platform_driver twl6040_codec_driver = { | |||
1247 | .owner = THIS_MODULE, | 1247 | .owner = THIS_MODULE, |
1248 | }, | 1248 | }, |
1249 | .probe = twl6040_codec_probe, | 1249 | .probe = twl6040_codec_probe, |
1250 | .remove = __devexit_p(twl6040_codec_remove), | 1250 | .remove = twl6040_codec_remove, |
1251 | }; | 1251 | }; |
1252 | 1252 | ||
1253 | module_platform_driver(twl6040_codec_driver); | 1253 | module_platform_driver(twl6040_codec_driver); |
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index 6c3d43b8ee85..6d0aa44c3757 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c | |||
@@ -601,13 +601,13 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = { | |||
601 | .set_bias_level = uda134x_set_bias_level, | 601 | .set_bias_level = uda134x_set_bias_level, |
602 | }; | 602 | }; |
603 | 603 | ||
604 | static int __devinit uda134x_codec_probe(struct platform_device *pdev) | 604 | static int uda134x_codec_probe(struct platform_device *pdev) |
605 | { | 605 | { |
606 | return snd_soc_register_codec(&pdev->dev, | 606 | return snd_soc_register_codec(&pdev->dev, |
607 | &soc_codec_dev_uda134x, &uda134x_dai, 1); | 607 | &soc_codec_dev_uda134x, &uda134x_dai, 1); |
608 | } | 608 | } |
609 | 609 | ||
610 | static int __devexit uda134x_codec_remove(struct platform_device *pdev) | 610 | static int uda134x_codec_remove(struct platform_device *pdev) |
611 | { | 611 | { |
612 | snd_soc_unregister_codec(&pdev->dev); | 612 | snd_soc_unregister_codec(&pdev->dev); |
613 | return 0; | 613 | return 0; |
@@ -619,7 +619,7 @@ static struct platform_driver uda134x_codec_driver = { | |||
619 | .owner = THIS_MODULE, | 619 | .owner = THIS_MODULE, |
620 | }, | 620 | }, |
621 | .probe = uda134x_codec_probe, | 621 | .probe = uda134x_codec_probe, |
622 | .remove = __devexit_p(uda134x_codec_remove), | 622 | .remove = uda134x_codec_remove, |
623 | }; | 623 | }; |
624 | 624 | ||
625 | module_platform_driver(uda134x_codec_driver); | 625 | module_platform_driver(uda134x_codec_driver); |
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 2502214b84ab..fd0a314bc209 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c | |||
@@ -795,8 +795,8 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { | |||
795 | }; | 795 | }; |
796 | 796 | ||
797 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 797 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
798 | static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, | 798 | static int uda1380_i2c_probe(struct i2c_client *i2c, |
799 | const struct i2c_device_id *id) | 799 | const struct i2c_device_id *id) |
800 | { | 800 | { |
801 | struct uda1380_priv *uda1380; | 801 | struct uda1380_priv *uda1380; |
802 | int ret; | 802 | int ret; |
@@ -814,7 +814,7 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, | |||
814 | return ret; | 814 | return ret; |
815 | } | 815 | } |
816 | 816 | ||
817 | static int __devexit uda1380_i2c_remove(struct i2c_client *i2c) | 817 | static int uda1380_i2c_remove(struct i2c_client *i2c) |
818 | { | 818 | { |
819 | snd_soc_unregister_codec(&i2c->dev); | 819 | snd_soc_unregister_codec(&i2c->dev); |
820 | return 0; | 820 | return 0; |
@@ -832,7 +832,7 @@ static struct i2c_driver uda1380_i2c_driver = { | |||
832 | .owner = THIS_MODULE, | 832 | .owner = THIS_MODULE, |
833 | }, | 833 | }, |
834 | .probe = uda1380_i2c_probe, | 834 | .probe = uda1380_i2c_probe, |
835 | .remove = __devexit_p(uda1380_i2c_remove), | 835 | .remove = uda1380_i2c_remove, |
836 | .id_table = uda1380_i2c_id, | 836 | .id_table = uda1380_i2c_id, |
837 | }; | 837 | }; |
838 | #endif | 838 | #endif |
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c index 7b24d6d192e1..54cd3da09abd 100644 --- a/sound/soc/codecs/wl1273.c +++ b/sound/soc/codecs/wl1273.c | |||
@@ -485,13 +485,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wl1273 = { | |||
485 | .remove = wl1273_remove, | 485 | .remove = wl1273_remove, |
486 | }; | 486 | }; |
487 | 487 | ||
488 | static int __devinit wl1273_platform_probe(struct platform_device *pdev) | 488 | static int wl1273_platform_probe(struct platform_device *pdev) |
489 | { | 489 | { |
490 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wl1273, | 490 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wl1273, |
491 | &wl1273_dai, 1); | 491 | &wl1273_dai, 1); |
492 | } | 492 | } |
493 | 493 | ||
494 | static int __devexit wl1273_platform_remove(struct platform_device *pdev) | 494 | static int wl1273_platform_remove(struct platform_device *pdev) |
495 | { | 495 | { |
496 | snd_soc_unregister_codec(&pdev->dev); | 496 | snd_soc_unregister_codec(&pdev->dev); |
497 | return 0; | 497 | return 0; |
@@ -505,7 +505,7 @@ static struct platform_driver wl1273_platform_driver = { | |||
505 | .owner = THIS_MODULE, | 505 | .owner = THIS_MODULE, |
506 | }, | 506 | }, |
507 | .probe = wl1273_platform_probe, | 507 | .probe = wl1273_platform_probe, |
508 | .remove = __devexit_p(wl1273_platform_remove), | 508 | .remove = wl1273_platform_remove, |
509 | }; | 509 | }; |
510 | 510 | ||
511 | module_platform_driver(wl1273_platform_driver); | 511 | module_platform_driver(wl1273_platform_driver); |
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 40256b526259..ad2fee4bb4cd 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c | |||
@@ -885,7 +885,7 @@ static int wm0010_probe(struct snd_soc_codec *codec) | |||
885 | return 0; | 885 | return 0; |
886 | } | 886 | } |
887 | 887 | ||
888 | static int __devinit wm0010_spi_probe(struct spi_device *spi) | 888 | static int wm0010_spi_probe(struct spi_device *spi) |
889 | { | 889 | { |
890 | unsigned long gpio_flags; | 890 | unsigned long gpio_flags; |
891 | int ret; | 891 | int ret; |
@@ -985,7 +985,7 @@ static int __devinit wm0010_spi_probe(struct spi_device *spi) | |||
985 | return 0; | 985 | return 0; |
986 | } | 986 | } |
987 | 987 | ||
988 | static int __devexit wm0010_spi_remove(struct spi_device *spi) | 988 | static int wm0010_spi_remove(struct spi_device *spi) |
989 | { | 989 | { |
990 | struct wm0010_priv *wm0010 = spi_get_drvdata(spi); | 990 | struct wm0010_priv *wm0010 = spi_get_drvdata(spi); |
991 | 991 | ||
@@ -1007,7 +1007,7 @@ static struct spi_driver wm0010_spi_driver = { | |||
1007 | .owner = THIS_MODULE, | 1007 | .owner = THIS_MODULE, |
1008 | }, | 1008 | }, |
1009 | .probe = wm0010_spi_probe, | 1009 | .probe = wm0010_spi_probe, |
1010 | .remove = __devexit_p(wm0010_spi_remove), | 1010 | .remove = wm0010_spi_remove, |
1011 | }; | 1011 | }; |
1012 | 1012 | ||
1013 | module_spi_driver(wm0010_spi_driver); | 1013 | module_spi_driver(wm0010_spi_driver); |
diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c index 951d7b49476a..6e6b93d4696e 100644 --- a/sound/soc/codecs/wm1250-ev1.c +++ b/sound/soc/codecs/wm1250-ev1.c | |||
@@ -153,7 +153,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm1250_ev1 = { | |||
153 | .idle_bias_off = true, | 153 | .idle_bias_off = true, |
154 | }; | 154 | }; |
155 | 155 | ||
156 | static int __devinit wm1250_ev1_pdata(struct i2c_client *i2c) | 156 | static int wm1250_ev1_pdata(struct i2c_client *i2c) |
157 | { | 157 | { |
158 | struct wm1250_ev1_pdata *pdata = dev_get_platdata(&i2c->dev); | 158 | struct wm1250_ev1_pdata *pdata = dev_get_platdata(&i2c->dev); |
159 | struct wm1250_priv *wm1250; | 159 | struct wm1250_priv *wm1250; |
@@ -199,8 +199,8 @@ static void wm1250_ev1_free(struct i2c_client *i2c) | |||
199 | gpio_free_array(wm1250->gpios, ARRAY_SIZE(wm1250->gpios)); | 199 | gpio_free_array(wm1250->gpios, ARRAY_SIZE(wm1250->gpios)); |
200 | } | 200 | } |
201 | 201 | ||
202 | static int __devinit wm1250_ev1_probe(struct i2c_client *i2c, | 202 | static int wm1250_ev1_probe(struct i2c_client *i2c, |
203 | const struct i2c_device_id *i2c_id) | 203 | const struct i2c_device_id *i2c_id) |
204 | { | 204 | { |
205 | int id, board, rev, ret; | 205 | int id, board, rev, ret; |
206 | 206 | ||
@@ -237,7 +237,7 @@ static int __devinit wm1250_ev1_probe(struct i2c_client *i2c, | |||
237 | return 0; | 237 | return 0; |
238 | } | 238 | } |
239 | 239 | ||
240 | static int __devexit wm1250_ev1_remove(struct i2c_client *i2c) | 240 | static int wm1250_ev1_remove(struct i2c_client *i2c) |
241 | { | 241 | { |
242 | snd_soc_unregister_codec(&i2c->dev); | 242 | snd_soc_unregister_codec(&i2c->dev); |
243 | wm1250_ev1_free(i2c); | 243 | wm1250_ev1_free(i2c); |
@@ -257,7 +257,7 @@ static struct i2c_driver wm1250_ev1_i2c_driver = { | |||
257 | .owner = THIS_MODULE, | 257 | .owner = THIS_MODULE, |
258 | }, | 258 | }, |
259 | .probe = wm1250_ev1_probe, | 259 | .probe = wm1250_ev1_probe, |
260 | .remove = __devexit_p(wm1250_ev1_remove), | 260 | .remove = wm1250_ev1_remove, |
261 | .id_table = wm1250_ev1_i2c_id, | 261 | .id_table = wm1250_ev1_i2c_id, |
262 | }; | 262 | }; |
263 | 263 | ||
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 02750ab020de..1cbe88f01d63 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c | |||
@@ -764,8 +764,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm2000 = { | |||
764 | .num_controls = ARRAY_SIZE(wm2000_controls), | 764 | .num_controls = ARRAY_SIZE(wm2000_controls), |
765 | }; | 765 | }; |
766 | 766 | ||
767 | static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, | 767 | static int wm2000_i2c_probe(struct i2c_client *i2c, |
768 | const struct i2c_device_id *i2c_id) | 768 | const struct i2c_device_id *i2c_id) |
769 | { | 769 | { |
770 | struct wm2000_priv *wm2000; | 770 | struct wm2000_priv *wm2000; |
771 | struct wm2000_platform_data *pdata; | 771 | struct wm2000_platform_data *pdata; |
@@ -871,7 +871,7 @@ out: | |||
871 | return ret; | 871 | return ret; |
872 | } | 872 | } |
873 | 873 | ||
874 | static __devexit int wm2000_i2c_remove(struct i2c_client *i2c) | 874 | static int wm2000_i2c_remove(struct i2c_client *i2c) |
875 | { | 875 | { |
876 | snd_soc_unregister_codec(&i2c->dev); | 876 | snd_soc_unregister_codec(&i2c->dev); |
877 | 877 | ||
@@ -890,7 +890,7 @@ static struct i2c_driver wm2000_i2c_driver = { | |||
890 | .owner = THIS_MODULE, | 890 | .owner = THIS_MODULE, |
891 | }, | 891 | }, |
892 | .probe = wm2000_i2c_probe, | 892 | .probe = wm2000_i2c_probe, |
893 | .remove = __devexit_p(wm2000_i2c_remove), | 893 | .remove = wm2000_i2c_remove, |
894 | .id_table = wm2000_i2c_id, | 894 | .id_table = wm2000_i2c_id, |
895 | }; | 895 | }; |
896 | 896 | ||
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index ff45b02a9dff..afcf31df77e0 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c | |||
@@ -2184,8 +2184,8 @@ static const unsigned int wm2200_mic_ctrl_reg[] = { | |||
2184 | WM2200_IN3L_CONTROL, | 2184 | WM2200_IN3L_CONTROL, |
2185 | }; | 2185 | }; |
2186 | 2186 | ||
2187 | static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, | 2187 | static int wm2200_i2c_probe(struct i2c_client *i2c, |
2188 | const struct i2c_device_id *id) | 2188 | const struct i2c_device_id *id) |
2189 | { | 2189 | { |
2190 | struct wm2200_pdata *pdata = dev_get_platdata(&i2c->dev); | 2190 | struct wm2200_pdata *pdata = dev_get_platdata(&i2c->dev); |
2191 | struct wm2200_priv *wm2200; | 2191 | struct wm2200_priv *wm2200; |
@@ -2385,7 +2385,7 @@ err_enable: | |||
2385 | return ret; | 2385 | return ret; |
2386 | } | 2386 | } |
2387 | 2387 | ||
2388 | static __devexit int wm2200_i2c_remove(struct i2c_client *i2c) | 2388 | static int wm2200_i2c_remove(struct i2c_client *i2c) |
2389 | { | 2389 | { |
2390 | struct wm2200_priv *wm2200 = i2c_get_clientdata(i2c); | 2390 | struct wm2200_priv *wm2200 = i2c_get_clientdata(i2c); |
2391 | 2391 | ||
@@ -2458,7 +2458,7 @@ static struct i2c_driver wm2200_i2c_driver = { | |||
2458 | .pm = &wm2200_pm, | 2458 | .pm = &wm2200_pm, |
2459 | }, | 2459 | }, |
2460 | .probe = wm2200_i2c_probe, | 2460 | .probe = wm2200_i2c_probe, |
2461 | .remove = __devexit_p(wm2200_i2c_remove), | 2461 | .remove = wm2200_i2c_remove, |
2462 | .id_table = wm2200_i2c_id, | 2462 | .id_table = wm2200_i2c_id, |
2463 | }; | 2463 | }; |
2464 | 2464 | ||
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 9f57996ff272..5a5f36936235 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c | |||
@@ -2414,8 +2414,8 @@ static const unsigned int wm5100_mic_ctrl_reg[] = { | |||
2414 | WM5100_IN4L_CONTROL, | 2414 | WM5100_IN4L_CONTROL, |
2415 | }; | 2415 | }; |
2416 | 2416 | ||
2417 | static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, | 2417 | static int wm5100_i2c_probe(struct i2c_client *i2c, |
2418 | const struct i2c_device_id *id) | 2418 | const struct i2c_device_id *id) |
2419 | { | 2419 | { |
2420 | struct wm5100_pdata *pdata = dev_get_platdata(&i2c->dev); | 2420 | struct wm5100_pdata *pdata = dev_get_platdata(&i2c->dev); |
2421 | struct wm5100_priv *wm5100; | 2421 | struct wm5100_priv *wm5100; |
@@ -2639,7 +2639,7 @@ err: | |||
2639 | return ret; | 2639 | return ret; |
2640 | } | 2640 | } |
2641 | 2641 | ||
2642 | static __devexit int wm5100_i2c_remove(struct i2c_client *i2c) | 2642 | static int wm5100_i2c_remove(struct i2c_client *i2c) |
2643 | { | 2643 | { |
2644 | struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c); | 2644 | struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c); |
2645 | 2645 | ||
@@ -2717,7 +2717,7 @@ static struct i2c_driver wm5100_i2c_driver = { | |||
2717 | .pm = &wm5100_pm, | 2717 | .pm = &wm5100_pm, |
2718 | }, | 2718 | }, |
2719 | .probe = wm5100_i2c_probe, | 2719 | .probe = wm5100_i2c_probe, |
2720 | .remove = __devexit_p(wm5100_i2c_remove), | 2720 | .remove = wm5100_i2c_remove, |
2721 | .id_table = wm5100_i2c_id, | 2721 | .id_table = wm5100_i2c_id, |
2722 | }; | 2722 | }; |
2723 | 2723 | ||
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 27f7e38e7eca..688ade080589 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c | |||
@@ -1475,7 +1475,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5102 = { | |||
1475 | .num_dapm_routes = ARRAY_SIZE(wm5102_dapm_routes), | 1475 | .num_dapm_routes = ARRAY_SIZE(wm5102_dapm_routes), |
1476 | }; | 1476 | }; |
1477 | 1477 | ||
1478 | static int __devinit wm5102_probe(struct platform_device *pdev) | 1478 | static int wm5102_probe(struct platform_device *pdev) |
1479 | { | 1479 | { |
1480 | struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); | 1480 | struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); |
1481 | struct wm5102_priv *wm5102; | 1481 | struct wm5102_priv *wm5102; |
@@ -1527,7 +1527,7 @@ static int __devinit wm5102_probe(struct platform_device *pdev) | |||
1527 | wm5102_dai, ARRAY_SIZE(wm5102_dai)); | 1527 | wm5102_dai, ARRAY_SIZE(wm5102_dai)); |
1528 | } | 1528 | } |
1529 | 1529 | ||
1530 | static int __devexit wm5102_remove(struct platform_device *pdev) | 1530 | static int wm5102_remove(struct platform_device *pdev) |
1531 | { | 1531 | { |
1532 | snd_soc_unregister_codec(&pdev->dev); | 1532 | snd_soc_unregister_codec(&pdev->dev); |
1533 | pm_runtime_disable(&pdev->dev); | 1533 | pm_runtime_disable(&pdev->dev); |
@@ -1541,7 +1541,7 @@ static struct platform_driver wm5102_codec_driver = { | |||
1541 | .owner = THIS_MODULE, | 1541 | .owner = THIS_MODULE, |
1542 | }, | 1542 | }, |
1543 | .probe = wm5102_probe, | 1543 | .probe = wm5102_probe, |
1544 | .remove = __devexit_p(wm5102_remove), | 1544 | .remove = wm5102_remove, |
1545 | }; | 1545 | }; |
1546 | 1546 | ||
1547 | module_platform_driver(wm5102_codec_driver); | 1547 | module_platform_driver(wm5102_codec_driver); |
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index c57dc7468300..ae80c8c28536 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c | |||
@@ -992,7 +992,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5110 = { | |||
992 | .num_dapm_routes = ARRAY_SIZE(wm5110_dapm_routes), | 992 | .num_dapm_routes = ARRAY_SIZE(wm5110_dapm_routes), |
993 | }; | 993 | }; |
994 | 994 | ||
995 | static int __devinit wm5110_probe(struct platform_device *pdev) | 995 | static int wm5110_probe(struct platform_device *pdev) |
996 | { | 996 | { |
997 | struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); | 997 | struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); |
998 | struct wm5110_priv *wm5110; | 998 | struct wm5110_priv *wm5110; |
@@ -1031,7 +1031,7 @@ static int __devinit wm5110_probe(struct platform_device *pdev) | |||
1031 | wm5110_dai, ARRAY_SIZE(wm5110_dai)); | 1031 | wm5110_dai, ARRAY_SIZE(wm5110_dai)); |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | static int __devexit wm5110_remove(struct platform_device *pdev) | 1034 | static int wm5110_remove(struct platform_device *pdev) |
1035 | { | 1035 | { |
1036 | snd_soc_unregister_codec(&pdev->dev); | 1036 | snd_soc_unregister_codec(&pdev->dev); |
1037 | pm_runtime_disable(&pdev->dev); | 1037 | pm_runtime_disable(&pdev->dev); |
@@ -1045,7 +1045,7 @@ static struct platform_driver wm5110_codec_driver = { | |||
1045 | .owner = THIS_MODULE, | 1045 | .owner = THIS_MODULE, |
1046 | }, | 1046 | }, |
1047 | .probe = wm5110_probe, | 1047 | .probe = wm5110_probe, |
1048 | .remove = __devexit_p(wm5110_remove), | 1048 | .remove = wm5110_remove, |
1049 | }; | 1049 | }; |
1050 | 1050 | ||
1051 | module_platform_driver(wm5110_codec_driver); | 1051 | module_platform_driver(wm5110_codec_driver); |
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 32b8f0852f6e..fb92fb47d636 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -1625,13 +1625,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { | |||
1625 | .num_dapm_routes = ARRAY_SIZE(wm8350_dapm_routes), | 1625 | .num_dapm_routes = ARRAY_SIZE(wm8350_dapm_routes), |
1626 | }; | 1626 | }; |
1627 | 1627 | ||
1628 | static int __devinit wm8350_probe(struct platform_device *pdev) | 1628 | static int wm8350_probe(struct platform_device *pdev) |
1629 | { | 1629 | { |
1630 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8350, | 1630 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8350, |
1631 | &wm8350_dai, 1); | 1631 | &wm8350_dai, 1); |
1632 | } | 1632 | } |
1633 | 1633 | ||
1634 | static int __devexit wm8350_remove(struct platform_device *pdev) | 1634 | static int wm8350_remove(struct platform_device *pdev) |
1635 | { | 1635 | { |
1636 | snd_soc_unregister_codec(&pdev->dev); | 1636 | snd_soc_unregister_codec(&pdev->dev); |
1637 | return 0; | 1637 | return 0; |
@@ -1643,7 +1643,7 @@ static struct platform_driver wm8350_codec_driver = { | |||
1643 | .owner = THIS_MODULE, | 1643 | .owner = THIS_MODULE, |
1644 | }, | 1644 | }, |
1645 | .probe = wm8350_probe, | 1645 | .probe = wm8350_probe, |
1646 | .remove = __devexit_p(wm8350_remove), | 1646 | .remove = wm8350_remove, |
1647 | }; | 1647 | }; |
1648 | 1648 | ||
1649 | module_platform_driver(wm8350_codec_driver); | 1649 | module_platform_driver(wm8350_codec_driver); |
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 262c44082eb0..af6d227e67be 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c | |||
@@ -1431,13 +1431,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { | |||
1431 | .num_dapm_routes = ARRAY_SIZE(wm8400_dapm_routes), | 1431 | .num_dapm_routes = ARRAY_SIZE(wm8400_dapm_routes), |
1432 | }; | 1432 | }; |
1433 | 1433 | ||
1434 | static int __devinit wm8400_probe(struct platform_device *pdev) | 1434 | static int wm8400_probe(struct platform_device *pdev) |
1435 | { | 1435 | { |
1436 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8400, | 1436 | return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8400, |
1437 | &wm8400_dai, 1); | 1437 | &wm8400_dai, 1); |
1438 | } | 1438 | } |
1439 | 1439 | ||
1440 | static int __devexit wm8400_remove(struct platform_device *pdev) | 1440 | static int wm8400_remove(struct platform_device *pdev) |
1441 | { | 1441 | { |
1442 | snd_soc_unregister_codec(&pdev->dev); | 1442 | snd_soc_unregister_codec(&pdev->dev); |
1443 | return 0; | 1443 | return 0; |
@@ -1449,7 +1449,7 @@ static struct platform_driver wm8400_codec_driver = { | |||
1449 | .owner = THIS_MODULE, | 1449 | .owner = THIS_MODULE, |
1450 | }, | 1450 | }, |
1451 | .probe = wm8400_probe, | 1451 | .probe = wm8400_probe, |
1452 | .remove = __devexit_p(wm8400_remove), | 1452 | .remove = wm8400_remove, |
1453 | }; | 1453 | }; |
1454 | 1454 | ||
1455 | module_platform_driver(wm8400_codec_driver); | 1455 | module_platform_driver(wm8400_codec_driver); |
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 923e7e1f6704..6ed5433943ea 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c | |||
@@ -645,7 +645,7 @@ static const struct regmap_config wm8510_regmap = { | |||
645 | }; | 645 | }; |
646 | 646 | ||
647 | #if defined(CONFIG_SPI_MASTER) | 647 | #if defined(CONFIG_SPI_MASTER) |
648 | static int __devinit wm8510_spi_probe(struct spi_device *spi) | 648 | static int wm8510_spi_probe(struct spi_device *spi) |
649 | { | 649 | { |
650 | struct wm8510_priv *wm8510; | 650 | struct wm8510_priv *wm8510; |
651 | int ret; | 651 | int ret; |
@@ -667,7 +667,7 @@ static int __devinit wm8510_spi_probe(struct spi_device *spi) | |||
667 | return ret; | 667 | return ret; |
668 | } | 668 | } |
669 | 669 | ||
670 | static int __devexit wm8510_spi_remove(struct spi_device *spi) | 670 | static int wm8510_spi_remove(struct spi_device *spi) |
671 | { | 671 | { |
672 | snd_soc_unregister_codec(&spi->dev); | 672 | snd_soc_unregister_codec(&spi->dev); |
673 | return 0; | 673 | return 0; |
@@ -680,13 +680,13 @@ static struct spi_driver wm8510_spi_driver = { | |||
680 | .of_match_table = wm8510_of_match, | 680 | .of_match_table = wm8510_of_match, |
681 | }, | 681 | }, |
682 | .probe = wm8510_spi_probe, | 682 | .probe = wm8510_spi_probe, |
683 | .remove = __devexit_p(wm8510_spi_remove), | 683 | .remove = wm8510_spi_remove, |
684 | }; | 684 | }; |
685 | #endif /* CONFIG_SPI_MASTER */ | 685 | #endif /* CONFIG_SPI_MASTER */ |
686 | 686 | ||
687 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 687 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
688 | static __devinit int wm8510_i2c_probe(struct i2c_client *i2c, | 688 | static int wm8510_i2c_probe(struct i2c_client *i2c, |
689 | const struct i2c_device_id *id) | 689 | const struct i2c_device_id *id) |
690 | { | 690 | { |
691 | struct wm8510_priv *wm8510; | 691 | struct wm8510_priv *wm8510; |
692 | int ret; | 692 | int ret; |
@@ -708,7 +708,7 @@ static __devinit int wm8510_i2c_probe(struct i2c_client *i2c, | |||
708 | return ret; | 708 | return ret; |
709 | } | 709 | } |
710 | 710 | ||
711 | static __devexit int wm8510_i2c_remove(struct i2c_client *client) | 711 | static int wm8510_i2c_remove(struct i2c_client *client) |
712 | { | 712 | { |
713 | snd_soc_unregister_codec(&client->dev); | 713 | snd_soc_unregister_codec(&client->dev); |
714 | return 0; | 714 | return 0; |
@@ -727,7 +727,7 @@ static struct i2c_driver wm8510_i2c_driver = { | |||
727 | .of_match_table = wm8510_of_match, | 727 | .of_match_table = wm8510_of_match, |
728 | }, | 728 | }, |
729 | .probe = wm8510_i2c_probe, | 729 | .probe = wm8510_i2c_probe, |
730 | .remove = __devexit_p(wm8510_i2c_remove), | 730 | .remove = wm8510_i2c_remove, |
731 | .id_table = wm8510_i2c_id, | 731 | .id_table = wm8510_i2c_id, |
732 | }; | 732 | }; |
733 | #endif | 733 | #endif |
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c index 8d5c27673501..139bf9ac9407 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c | |||
@@ -453,8 +453,8 @@ static const struct regmap_config wm8523_regmap = { | |||
453 | }; | 453 | }; |
454 | 454 | ||
455 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 455 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
456 | static __devinit int wm8523_i2c_probe(struct i2c_client *i2c, | 456 | static int wm8523_i2c_probe(struct i2c_client *i2c, |
457 | const struct i2c_device_id *id) | 457 | const struct i2c_device_id *id) |
458 | { | 458 | { |
459 | struct wm8523_priv *wm8523; | 459 | struct wm8523_priv *wm8523; |
460 | unsigned int val; | 460 | unsigned int val; |
@@ -528,7 +528,7 @@ err_enable: | |||
528 | return ret; | 528 | return ret; |
529 | } | 529 | } |
530 | 530 | ||
531 | static __devexit int wm8523_i2c_remove(struct i2c_client *client) | 531 | static int wm8523_i2c_remove(struct i2c_client *client) |
532 | { | 532 | { |
533 | snd_soc_unregister_codec(&client->dev); | 533 | snd_soc_unregister_codec(&client->dev); |
534 | return 0; | 534 | return 0; |
@@ -547,7 +547,7 @@ static struct i2c_driver wm8523_i2c_driver = { | |||
547 | .of_match_table = wm8523_of_match, | 547 | .of_match_table = wm8523_of_match, |
548 | }, | 548 | }, |
549 | .probe = wm8523_i2c_probe, | 549 | .probe = wm8523_i2c_probe, |
550 | .remove = __devexit_p(wm8523_i2c_remove), | 550 | .remove = wm8523_i2c_remove, |
551 | .id_table = wm8523_i2c_id, | 551 | .id_table = wm8523_i2c_id, |
552 | }; | 552 | }; |
553 | #endif | 553 | #endif |
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 8b8bb70f1eb9..5b428b060d41 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c | |||
@@ -429,7 +429,7 @@ static const struct regmap_config wm8711_regmap = { | |||
429 | }; | 429 | }; |
430 | 430 | ||
431 | #if defined(CONFIG_SPI_MASTER) | 431 | #if defined(CONFIG_SPI_MASTER) |
432 | static int __devinit wm8711_spi_probe(struct spi_device *spi) | 432 | static int wm8711_spi_probe(struct spi_device *spi) |
433 | { | 433 | { |
434 | struct wm8711_priv *wm8711; | 434 | struct wm8711_priv *wm8711; |
435 | int ret; | 435 | int ret; |
@@ -451,7 +451,7 @@ static int __devinit wm8711_spi_probe(struct spi_device *spi) | |||
451 | return ret; | 451 | return ret; |
452 | } | 452 | } |
453 | 453 | ||
454 | static int __devexit wm8711_spi_remove(struct spi_device *spi) | 454 | static int wm8711_spi_remove(struct spi_device *spi) |
455 | { | 455 | { |
456 | snd_soc_unregister_codec(&spi->dev); | 456 | snd_soc_unregister_codec(&spi->dev); |
457 | 457 | ||
@@ -465,13 +465,13 @@ static struct spi_driver wm8711_spi_driver = { | |||
465 | .of_match_table = wm8711_of_match, | 465 | .of_match_table = wm8711_of_match, |
466 | }, | 466 | }, |
467 | .probe = wm8711_spi_probe, | 467 | .probe = wm8711_spi_probe, |
468 | .remove = __devexit_p(wm8711_spi_remove), | 468 | .remove = wm8711_spi_remove, |
469 | }; | 469 | }; |
470 | #endif /* CONFIG_SPI_MASTER */ | 470 | #endif /* CONFIG_SPI_MASTER */ |
471 | 471 | ||
472 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 472 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
473 | static __devinit int wm8711_i2c_probe(struct i2c_client *client, | 473 | static int wm8711_i2c_probe(struct i2c_client *client, |
474 | const struct i2c_device_id *id) | 474 | const struct i2c_device_id *id) |
475 | { | 475 | { |
476 | struct wm8711_priv *wm8711; | 476 | struct wm8711_priv *wm8711; |
477 | int ret; | 477 | int ret; |
@@ -493,7 +493,7 @@ static __devinit int wm8711_i2c_probe(struct i2c_client *client, | |||
493 | return ret; | 493 | return ret; |
494 | } | 494 | } |
495 | 495 | ||
496 | static __devexit int wm8711_i2c_remove(struct i2c_client *client) | 496 | static int wm8711_i2c_remove(struct i2c_client *client) |
497 | { | 497 | { |
498 | snd_soc_unregister_codec(&client->dev); | 498 | snd_soc_unregister_codec(&client->dev); |
499 | return 0; | 499 | return 0; |
@@ -512,7 +512,7 @@ static struct i2c_driver wm8711_i2c_driver = { | |||
512 | .of_match_table = wm8711_of_match, | 512 | .of_match_table = wm8711_of_match, |
513 | }, | 513 | }, |
514 | .probe = wm8711_i2c_probe, | 514 | .probe = wm8711_i2c_probe, |
515 | .remove = __devexit_p(wm8711_i2c_remove), | 515 | .remove = wm8711_i2c_remove, |
516 | .id_table = wm8711_i2c_id, | 516 | .id_table = wm8711_i2c_id, |
517 | }; | 517 | }; |
518 | #endif | 518 | #endif |
diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c index e81705620718..462f5e4d5c05 100644 --- a/sound/soc/codecs/wm8727.c +++ b/sound/soc/codecs/wm8727.c | |||
@@ -45,13 +45,13 @@ static struct snd_soc_dai_driver wm8727_dai = { | |||
45 | 45 | ||
46 | static struct snd_soc_codec_driver soc_codec_dev_wm8727; | 46 | static struct snd_soc_codec_driver soc_codec_dev_wm8727; |
47 | 47 | ||
48 | static __devinit int wm8727_probe(struct platform_device *pdev) | 48 | static int wm8727_probe(struct platform_device *pdev) |
49 | { | 49 | { |
50 | return snd_soc_register_codec(&pdev->dev, | 50 | return snd_soc_register_codec(&pdev->dev, |
51 | &soc_codec_dev_wm8727, &wm8727_dai, 1); | 51 | &soc_codec_dev_wm8727, &wm8727_dai, 1); |
52 | } | 52 | } |
53 | 53 | ||
54 | static int __devexit wm8727_remove(struct platform_device *pdev) | 54 | static int wm8727_remove(struct platform_device *pdev) |
55 | { | 55 | { |
56 | snd_soc_unregister_codec(&pdev->dev); | 56 | snd_soc_unregister_codec(&pdev->dev); |
57 | return 0; | 57 | return 0; |
@@ -64,7 +64,7 @@ static struct platform_driver wm8727_codec_driver = { | |||
64 | }, | 64 | }, |
65 | 65 | ||
66 | .probe = wm8727_probe, | 66 | .probe = wm8727_probe, |
67 | .remove = __devexit_p(wm8727_remove), | 67 | .remove = wm8727_remove, |
68 | }; | 68 | }; |
69 | 69 | ||
70 | module_platform_driver(wm8727_codec_driver); | 70 | module_platform_driver(wm8727_codec_driver); |
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 |
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index bb1d26919b10..5276062d6c79 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -631,7 +631,7 @@ static const struct regmap_config wm8731_regmap = { | |||
631 | }; | 631 | }; |
632 | 632 | ||
633 | #if defined(CONFIG_SPI_MASTER) | 633 | #if defined(CONFIG_SPI_MASTER) |
634 | static int __devinit wm8731_spi_probe(struct spi_device *spi) | 634 | static int wm8731_spi_probe(struct spi_device *spi) |
635 | { | 635 | { |
636 | struct wm8731_priv *wm8731; | 636 | struct wm8731_priv *wm8731; |
637 | int ret; | 637 | int ret; |
@@ -661,7 +661,7 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi) | |||
661 | return 0; | 661 | return 0; |
662 | } | 662 | } |
663 | 663 | ||
664 | static int __devexit wm8731_spi_remove(struct spi_device *spi) | 664 | static int wm8731_spi_remove(struct spi_device *spi) |
665 | { | 665 | { |
666 | snd_soc_unregister_codec(&spi->dev); | 666 | snd_soc_unregister_codec(&spi->dev); |
667 | return 0; | 667 | return 0; |
@@ -674,13 +674,13 @@ static struct spi_driver wm8731_spi_driver = { | |||
674 | .of_match_table = wm8731_of_match, | 674 | .of_match_table = wm8731_of_match, |
675 | }, | 675 | }, |
676 | .probe = wm8731_spi_probe, | 676 | .probe = wm8731_spi_probe, |
677 | .remove = __devexit_p(wm8731_spi_remove), | 677 | .remove = wm8731_spi_remove, |
678 | }; | 678 | }; |
679 | #endif /* CONFIG_SPI_MASTER */ | 679 | #endif /* CONFIG_SPI_MASTER */ |
680 | 680 | ||
681 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 681 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
682 | static __devinit int wm8731_i2c_probe(struct i2c_client *i2c, | 682 | static int wm8731_i2c_probe(struct i2c_client *i2c, |
683 | const struct i2c_device_id *id) | 683 | const struct i2c_device_id *id) |
684 | { | 684 | { |
685 | struct wm8731_priv *wm8731; | 685 | struct wm8731_priv *wm8731; |
686 | int ret; | 686 | int ret; |
@@ -710,7 +710,7 @@ static __devinit int wm8731_i2c_probe(struct i2c_client *i2c, | |||
710 | return 0; | 710 | return 0; |
711 | } | 711 | } |
712 | 712 | ||
713 | static __devexit int wm8731_i2c_remove(struct i2c_client *client) | 713 | static int wm8731_i2c_remove(struct i2c_client *client) |
714 | { | 714 | { |
715 | snd_soc_unregister_codec(&client->dev); | 715 | snd_soc_unregister_codec(&client->dev); |
716 | return 0; | 716 | return 0; |
@@ -729,7 +729,7 @@ static struct i2c_driver wm8731_i2c_driver = { | |||
729 | .of_match_table = wm8731_of_match, | 729 | .of_match_table = wm8731_of_match, |
730 | }, | 730 | }, |
731 | .probe = wm8731_i2c_probe, | 731 | .probe = wm8731_i2c_probe, |
732 | .remove = __devexit_p(wm8731_i2c_remove), | 732 | .remove = wm8731_i2c_remove, |
733 | .id_table = wm8731_i2c_id, | 733 | .id_table = wm8731_i2c_id, |
734 | }; | 734 | }; |
735 | #endif | 735 | #endif |
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c index 5c9634f4c1f0..2f167a8ca01b 100644 --- a/sound/soc/codecs/wm8737.c +++ b/sound/soc/codecs/wm8737.c | |||
@@ -645,8 +645,8 @@ static const struct regmap_config wm8737_regmap = { | |||
645 | }; | 645 | }; |
646 | 646 | ||
647 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 647 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
648 | static __devinit int wm8737_i2c_probe(struct i2c_client *i2c, | 648 | static int wm8737_i2c_probe(struct i2c_client *i2c, |
649 | const struct i2c_device_id *id) | 649 | const struct i2c_device_id *id) |
650 | { | 650 | { |
651 | struct wm8737_priv *wm8737; | 651 | struct wm8737_priv *wm8737; |
652 | int ret, i; | 652 | int ret, i; |
@@ -679,7 +679,7 @@ static __devinit int wm8737_i2c_probe(struct i2c_client *i2c, | |||
679 | 679 | ||
680 | } | 680 | } |
681 | 681 | ||
682 | static __devexit int wm8737_i2c_remove(struct i2c_client *client) | 682 | static int wm8737_i2c_remove(struct i2c_client *client) |
683 | { | 683 | { |
684 | snd_soc_unregister_codec(&client->dev); | 684 | snd_soc_unregister_codec(&client->dev); |
685 | 685 | ||
@@ -699,13 +699,13 @@ static struct i2c_driver wm8737_i2c_driver = { | |||
699 | .of_match_table = wm8737_of_match, | 699 | .of_match_table = wm8737_of_match, |
700 | }, | 700 | }, |
701 | .probe = wm8737_i2c_probe, | 701 | .probe = wm8737_i2c_probe, |
702 | .remove = __devexit_p(wm8737_i2c_remove), | 702 | .remove = wm8737_i2c_remove, |
703 | .id_table = wm8737_i2c_id, | 703 | .id_table = wm8737_i2c_id, |
704 | }; | 704 | }; |
705 | #endif | 705 | #endif |
706 | 706 | ||
707 | #if defined(CONFIG_SPI_MASTER) | 707 | #if defined(CONFIG_SPI_MASTER) |
708 | static int __devinit wm8737_spi_probe(struct spi_device *spi) | 708 | static int wm8737_spi_probe(struct spi_device *spi) |
709 | { | 709 | { |
710 | struct wm8737_priv *wm8737; | 710 | struct wm8737_priv *wm8737; |
711 | int ret, i; | 711 | int ret, i; |
@@ -737,7 +737,7 @@ static int __devinit wm8737_spi_probe(struct spi_device *spi) | |||
737 | return ret; | 737 | return ret; |
738 | } | 738 | } |
739 | 739 | ||
740 | static int __devexit wm8737_spi_remove(struct spi_device *spi) | 740 | static int wm8737_spi_remove(struct spi_device *spi) |
741 | { | 741 | { |
742 | snd_soc_unregister_codec(&spi->dev); | 742 | snd_soc_unregister_codec(&spi->dev); |
743 | 743 | ||
@@ -751,7 +751,7 @@ static struct spi_driver wm8737_spi_driver = { | |||
751 | .of_match_table = wm8737_of_match, | 751 | .of_match_table = wm8737_of_match, |
752 | }, | 752 | }, |
753 | .probe = wm8737_spi_probe, | 753 | .probe = wm8737_spi_probe, |
754 | .remove = __devexit_p(wm8737_spi_remove), | 754 | .remove = wm8737_spi_remove, |
755 | }; | 755 | }; |
756 | #endif /* CONFIG_SPI_MASTER */ | 756 | #endif /* CONFIG_SPI_MASTER */ |
757 | 757 | ||
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 99b8ebe93424..b18813cc7ba9 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c | |||
@@ -562,7 +562,7 @@ static struct i2c_driver wm8741_i2c_driver = { | |||
562 | #endif | 562 | #endif |
563 | 563 | ||
564 | #if defined(CONFIG_SPI_MASTER) | 564 | #if defined(CONFIG_SPI_MASTER) |
565 | static int __devinit wm8741_spi_probe(struct spi_device *spi) | 565 | static int wm8741_spi_probe(struct spi_device *spi) |
566 | { | 566 | { |
567 | struct wm8741_priv *wm8741; | 567 | struct wm8741_priv *wm8741; |
568 | int ret, i; | 568 | int ret, i; |
@@ -596,7 +596,7 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi) | |||
596 | return ret; | 596 | return ret; |
597 | } | 597 | } |
598 | 598 | ||
599 | static int __devexit wm8741_spi_remove(struct spi_device *spi) | 599 | static int wm8741_spi_remove(struct spi_device *spi) |
600 | { | 600 | { |
601 | snd_soc_unregister_codec(&spi->dev); | 601 | snd_soc_unregister_codec(&spi->dev); |
602 | return 0; | 602 | return 0; |
@@ -609,7 +609,7 @@ static struct spi_driver wm8741_spi_driver = { | |||
609 | .of_match_table = wm8741_of_match, | 609 | .of_match_table = wm8741_of_match, |
610 | }, | 610 | }, |
611 | .probe = wm8741_spi_probe, | 611 | .probe = wm8741_spi_probe, |
612 | .remove = __devexit_p(wm8741_spi_remove), | 612 | .remove = wm8741_spi_remove, |
613 | }; | 613 | }; |
614 | #endif /* CONFIG_SPI_MASTER */ | 614 | #endif /* CONFIG_SPI_MASTER */ |
615 | 615 | ||
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 7665d68c4558..50d5ff616232 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -769,7 +769,7 @@ static const struct regmap_config wm8750_regmap = { | |||
769 | }; | 769 | }; |
770 | 770 | ||
771 | #if defined(CONFIG_SPI_MASTER) | 771 | #if defined(CONFIG_SPI_MASTER) |
772 | static int __devinit wm8750_spi_probe(struct spi_device *spi) | 772 | static int wm8750_spi_probe(struct spi_device *spi) |
773 | { | 773 | { |
774 | struct wm8750_priv *wm8750; | 774 | struct wm8750_priv *wm8750; |
775 | struct regmap *regmap; | 775 | struct regmap *regmap; |
@@ -791,7 +791,7 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi) | |||
791 | return ret; | 791 | return ret; |
792 | } | 792 | } |
793 | 793 | ||
794 | static int __devexit wm8750_spi_remove(struct spi_device *spi) | 794 | static int wm8750_spi_remove(struct spi_device *spi) |
795 | { | 795 | { |
796 | snd_soc_unregister_codec(&spi->dev); | 796 | snd_soc_unregister_codec(&spi->dev); |
797 | return 0; | 797 | return 0; |
@@ -812,13 +812,13 @@ static struct spi_driver wm8750_spi_driver = { | |||
812 | }, | 812 | }, |
813 | .id_table = wm8750_spi_ids, | 813 | .id_table = wm8750_spi_ids, |
814 | .probe = wm8750_spi_probe, | 814 | .probe = wm8750_spi_probe, |
815 | .remove = __devexit_p(wm8750_spi_remove), | 815 | .remove = wm8750_spi_remove, |
816 | }; | 816 | }; |
817 | #endif /* CONFIG_SPI_MASTER */ | 817 | #endif /* CONFIG_SPI_MASTER */ |
818 | 818 | ||
819 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 819 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
820 | static __devinit int wm8750_i2c_probe(struct i2c_client *i2c, | 820 | static int wm8750_i2c_probe(struct i2c_client *i2c, |
821 | const struct i2c_device_id *id) | 821 | const struct i2c_device_id *id) |
822 | { | 822 | { |
823 | struct wm8750_priv *wm8750; | 823 | struct wm8750_priv *wm8750; |
824 | struct regmap *regmap; | 824 | struct regmap *regmap; |
@@ -840,7 +840,7 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c, | |||
840 | return ret; | 840 | return ret; |
841 | } | 841 | } |
842 | 842 | ||
843 | static __devexit int wm8750_i2c_remove(struct i2c_client *client) | 843 | static int wm8750_i2c_remove(struct i2c_client *client) |
844 | { | 844 | { |
845 | snd_soc_unregister_codec(&client->dev); | 845 | snd_soc_unregister_codec(&client->dev); |
846 | return 0; | 846 | return 0; |
@@ -860,7 +860,7 @@ static struct i2c_driver wm8750_i2c_driver = { | |||
860 | .of_match_table = wm8750_of_match, | 860 | .of_match_table = wm8750_of_match, |
861 | }, | 861 | }, |
862 | .probe = wm8750_i2c_probe, | 862 | .probe = wm8750_i2c_probe, |
863 | .remove = __devexit_p(wm8750_i2c_remove), | 863 | .remove = wm8750_i2c_remove, |
864 | .id_table = wm8750_i2c_id, | 864 | .id_table = wm8750_i2c_id, |
865 | }; | 865 | }; |
866 | #endif | 866 | #endif |
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 50a5dc7974e1..0a4ab4c423d1 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -1550,7 +1550,7 @@ static const struct regmap_config wm8753_regmap = { | |||
1550 | }; | 1550 | }; |
1551 | 1551 | ||
1552 | #if defined(CONFIG_SPI_MASTER) | 1552 | #if defined(CONFIG_SPI_MASTER) |
1553 | static int __devinit wm8753_spi_probe(struct spi_device *spi) | 1553 | static int wm8753_spi_probe(struct spi_device *spi) |
1554 | { | 1554 | { |
1555 | struct wm8753_priv *wm8753; | 1555 | struct wm8753_priv *wm8753; |
1556 | int ret; | 1556 | int ret; |
@@ -1578,7 +1578,7 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi) | |||
1578 | return ret; | 1578 | return ret; |
1579 | } | 1579 | } |
1580 | 1580 | ||
1581 | static int __devexit wm8753_spi_remove(struct spi_device *spi) | 1581 | static int wm8753_spi_remove(struct spi_device *spi) |
1582 | { | 1582 | { |
1583 | snd_soc_unregister_codec(&spi->dev); | 1583 | snd_soc_unregister_codec(&spi->dev); |
1584 | return 0; | 1584 | return 0; |
@@ -1591,13 +1591,13 @@ static struct spi_driver wm8753_spi_driver = { | |||
1591 | .of_match_table = wm8753_of_match, | 1591 | .of_match_table = wm8753_of_match, |
1592 | }, | 1592 | }, |
1593 | .probe = wm8753_spi_probe, | 1593 | .probe = wm8753_spi_probe, |
1594 | .remove = __devexit_p(wm8753_spi_remove), | 1594 | .remove = wm8753_spi_remove, |
1595 | }; | 1595 | }; |
1596 | #endif /* CONFIG_SPI_MASTER */ | 1596 | #endif /* CONFIG_SPI_MASTER */ |
1597 | 1597 | ||
1598 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 1598 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
1599 | static __devinit int wm8753_i2c_probe(struct i2c_client *i2c, | 1599 | static int wm8753_i2c_probe(struct i2c_client *i2c, |
1600 | const struct i2c_device_id *id) | 1600 | const struct i2c_device_id *id) |
1601 | { | 1601 | { |
1602 | struct wm8753_priv *wm8753; | 1602 | struct wm8753_priv *wm8753; |
1603 | int ret; | 1603 | int ret; |
@@ -1625,7 +1625,7 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c, | |||
1625 | return ret; | 1625 | return ret; |
1626 | } | 1626 | } |
1627 | 1627 | ||
1628 | static __devexit int wm8753_i2c_remove(struct i2c_client *client) | 1628 | static int wm8753_i2c_remove(struct i2c_client *client) |
1629 | { | 1629 | { |
1630 | snd_soc_unregister_codec(&client->dev); | 1630 | snd_soc_unregister_codec(&client->dev); |
1631 | return 0; | 1631 | return 0; |
@@ -1644,7 +1644,7 @@ static struct i2c_driver wm8753_i2c_driver = { | |||
1644 | .of_match_table = wm8753_of_match, | 1644 | .of_match_table = wm8753_of_match, |
1645 | }, | 1645 | }, |
1646 | .probe = wm8753_i2c_probe, | 1646 | .probe = wm8753_i2c_probe, |
1647 | .remove = __devexit_p(wm8753_i2c_remove), | 1647 | .remove = wm8753_i2c_remove, |
1648 | .id_table = wm8753_i2c_id, | 1648 | .id_table = wm8753_i2c_id, |
1649 | }; | 1649 | }; |
1650 | #endif | 1650 | #endif |
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 0b690ba875f8..89a18d82f303 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c | |||
@@ -650,7 +650,7 @@ static const struct regmap_config wm8770_regmap = { | |||
650 | .volatile_reg = wm8770_volatile_reg, | 650 | .volatile_reg = wm8770_volatile_reg, |
651 | }; | 651 | }; |
652 | 652 | ||
653 | static int __devinit wm8770_spi_probe(struct spi_device *spi) | 653 | static int wm8770_spi_probe(struct spi_device *spi) |
654 | { | 654 | { |
655 | struct wm8770_priv *wm8770; | 655 | struct wm8770_priv *wm8770; |
656 | int ret, i; | 656 | int ret, i; |
@@ -697,7 +697,7 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi) | |||
697 | return ret; | 697 | return ret; |
698 | } | 698 | } |
699 | 699 | ||
700 | static int __devexit wm8770_spi_remove(struct spi_device *spi) | 700 | static int wm8770_spi_remove(struct spi_device *spi) |
701 | { | 701 | { |
702 | struct wm8770_priv *wm8770 = spi_get_drvdata(spi); | 702 | struct wm8770_priv *wm8770 = spi_get_drvdata(spi); |
703 | int i; | 703 | int i; |
@@ -718,7 +718,7 @@ static struct spi_driver wm8770_spi_driver = { | |||
718 | .of_match_table = wm8770_of_match, | 718 | .of_match_table = wm8770_of_match, |
719 | }, | 719 | }, |
720 | .probe = wm8770_spi_probe, | 720 | .probe = wm8770_spi_probe, |
721 | .remove = __devexit_p(wm8770_spi_remove) | 721 | .remove = wm8770_spi_remove |
722 | }; | 722 | }; |
723 | 723 | ||
724 | module_spi_driver(wm8770_spi_driver); | 724 | module_spi_driver(wm8770_spi_driver); |
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 |
diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c index 3fdea98f732e..f1fdbf63abb4 100644 --- a/sound/soc/codecs/wm8782.c +++ b/sound/soc/codecs/wm8782.c | |||
@@ -42,13 +42,13 @@ static struct snd_soc_dai_driver wm8782_dai = { | |||
42 | 42 | ||
43 | static struct snd_soc_codec_driver soc_codec_dev_wm8782; | 43 | static struct snd_soc_codec_driver soc_codec_dev_wm8782; |
44 | 44 | ||
45 | static __devinit int wm8782_probe(struct platform_device *pdev) | 45 | static int wm8782_probe(struct platform_device *pdev) |
46 | { | 46 | { |
47 | return snd_soc_register_codec(&pdev->dev, | 47 | return snd_soc_register_codec(&pdev->dev, |
48 | &soc_codec_dev_wm8782, &wm8782_dai, 1); | 48 | &soc_codec_dev_wm8782, &wm8782_dai, 1); |
49 | } | 49 | } |
50 | 50 | ||
51 | static int __devexit wm8782_remove(struct platform_device *pdev) | 51 | static int wm8782_remove(struct platform_device *pdev) |
52 | { | 52 | { |
53 | snd_soc_unregister_codec(&pdev->dev); | 53 | snd_soc_unregister_codec(&pdev->dev); |
54 | return 0; | 54 | return 0; |
@@ -60,7 +60,7 @@ static struct platform_driver wm8782_codec_driver = { | |||
60 | .owner = THIS_MODULE, | 60 | .owner = THIS_MODULE, |
61 | }, | 61 | }, |
62 | .probe = wm8782_probe, | 62 | .probe = wm8782_probe, |
63 | .remove = __devexit_p(wm8782_remove), | 63 | .remove = wm8782_remove, |
64 | }; | 64 | }; |
65 | 65 | ||
66 | module_platform_driver(wm8782_codec_driver); | 66 | module_platform_driver(wm8782_codec_driver); |
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 837bfb51cebf..d321a875b029 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c | |||
@@ -702,7 +702,7 @@ static struct regmap_config wm8804_regmap_config = { | |||
702 | }; | 702 | }; |
703 | 703 | ||
704 | #if defined(CONFIG_SPI_MASTER) | 704 | #if defined(CONFIG_SPI_MASTER) |
705 | static int __devinit wm8804_spi_probe(struct spi_device *spi) | 705 | static int wm8804_spi_probe(struct spi_device *spi) |
706 | { | 706 | { |
707 | struct wm8804_priv *wm8804; | 707 | struct wm8804_priv *wm8804; |
708 | int ret; | 708 | int ret; |
@@ -725,7 +725,7 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi) | |||
725 | return ret; | 725 | return ret; |
726 | } | 726 | } |
727 | 727 | ||
728 | static int __devexit wm8804_spi_remove(struct spi_device *spi) | 728 | static int wm8804_spi_remove(struct spi_device *spi) |
729 | { | 729 | { |
730 | snd_soc_unregister_codec(&spi->dev); | 730 | snd_soc_unregister_codec(&spi->dev); |
731 | return 0; | 731 | return 0; |
@@ -738,13 +738,13 @@ static struct spi_driver wm8804_spi_driver = { | |||
738 | .of_match_table = wm8804_of_match, | 738 | .of_match_table = wm8804_of_match, |
739 | }, | 739 | }, |
740 | .probe = wm8804_spi_probe, | 740 | .probe = wm8804_spi_probe, |
741 | .remove = __devexit_p(wm8804_spi_remove) | 741 | .remove = wm8804_spi_remove |
742 | }; | 742 | }; |
743 | #endif | 743 | #endif |
744 | 744 | ||
745 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 745 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
746 | static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, | 746 | static int wm8804_i2c_probe(struct i2c_client *i2c, |
747 | const struct i2c_device_id *id) | 747 | const struct i2c_device_id *id) |
748 | { | 748 | { |
749 | struct wm8804_priv *wm8804; | 749 | struct wm8804_priv *wm8804; |
750 | int ret; | 750 | int ret; |
@@ -766,7 +766,7 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, | |||
766 | return ret; | 766 | return ret; |
767 | } | 767 | } |
768 | 768 | ||
769 | static __devexit int wm8804_i2c_remove(struct i2c_client *i2c) | 769 | static int wm8804_i2c_remove(struct i2c_client *i2c) |
770 | { | 770 | { |
771 | snd_soc_unregister_codec(&i2c->dev); | 771 | snd_soc_unregister_codec(&i2c->dev); |
772 | return 0; | 772 | return 0; |
@@ -785,7 +785,7 @@ static struct i2c_driver wm8804_i2c_driver = { | |||
785 | .of_match_table = wm8804_of_match, | 785 | .of_match_table = wm8804_of_match, |
786 | }, | 786 | }, |
787 | .probe = wm8804_i2c_probe, | 787 | .probe = wm8804_i2c_probe, |
788 | .remove = __devexit_p(wm8804_i2c_remove), | 788 | .remove = wm8804_i2c_remove, |
789 | .id_table = wm8804_i2c_id | 789 | .id_table = wm8804_i2c_id |
790 | }; | 790 | }; |
791 | #endif | 791 | #endif |
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index e781f865e5d7..7c8257c5a17b 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -1247,7 +1247,7 @@ static const struct regmap_config wm8900_regmap = { | |||
1247 | }; | 1247 | }; |
1248 | 1248 | ||
1249 | #if defined(CONFIG_SPI_MASTER) | 1249 | #if defined(CONFIG_SPI_MASTER) |
1250 | static int __devinit wm8900_spi_probe(struct spi_device *spi) | 1250 | static int wm8900_spi_probe(struct spi_device *spi) |
1251 | { | 1251 | { |
1252 | struct wm8900_priv *wm8900; | 1252 | struct wm8900_priv *wm8900; |
1253 | int ret; | 1253 | int ret; |
@@ -1269,7 +1269,7 @@ static int __devinit wm8900_spi_probe(struct spi_device *spi) | |||
1269 | return ret; | 1269 | return ret; |
1270 | } | 1270 | } |
1271 | 1271 | ||
1272 | static int __devexit wm8900_spi_remove(struct spi_device *spi) | 1272 | static int wm8900_spi_remove(struct spi_device *spi) |
1273 | { | 1273 | { |
1274 | snd_soc_unregister_codec(&spi->dev); | 1274 | snd_soc_unregister_codec(&spi->dev); |
1275 | return 0; | 1275 | return 0; |
@@ -1281,13 +1281,13 @@ static struct spi_driver wm8900_spi_driver = { | |||
1281 | .owner = THIS_MODULE, | 1281 | .owner = THIS_MODULE, |
1282 | }, | 1282 | }, |
1283 | .probe = wm8900_spi_probe, | 1283 | .probe = wm8900_spi_probe, |
1284 | .remove = __devexit_p(wm8900_spi_remove), | 1284 | .remove = wm8900_spi_remove, |
1285 | }; | 1285 | }; |
1286 | #endif /* CONFIG_SPI_MASTER */ | 1286 | #endif /* CONFIG_SPI_MASTER */ |
1287 | 1287 | ||
1288 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 1288 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
1289 | static __devinit int wm8900_i2c_probe(struct i2c_client *i2c, | 1289 | static int wm8900_i2c_probe(struct i2c_client *i2c, |
1290 | const struct i2c_device_id *id) | 1290 | const struct i2c_device_id *id) |
1291 | { | 1291 | { |
1292 | struct wm8900_priv *wm8900; | 1292 | struct wm8900_priv *wm8900; |
1293 | int ret; | 1293 | int ret; |
@@ -1309,7 +1309,7 @@ static __devinit int wm8900_i2c_probe(struct i2c_client *i2c, | |||
1309 | return ret; | 1309 | return ret; |
1310 | } | 1310 | } |
1311 | 1311 | ||
1312 | static __devexit int wm8900_i2c_remove(struct i2c_client *client) | 1312 | static int wm8900_i2c_remove(struct i2c_client *client) |
1313 | { | 1313 | { |
1314 | snd_soc_unregister_codec(&client->dev); | 1314 | snd_soc_unregister_codec(&client->dev); |
1315 | return 0; | 1315 | return 0; |
@@ -1327,7 +1327,7 @@ static struct i2c_driver wm8900_i2c_driver = { | |||
1327 | .owner = THIS_MODULE, | 1327 | .owner = THIS_MODULE, |
1328 | }, | 1328 | }, |
1329 | .probe = wm8900_i2c_probe, | 1329 | .probe = wm8900_i2c_probe, |
1330 | .remove = __devexit_p(wm8900_i2c_remove), | 1330 | .remove = wm8900_i2c_remove, |
1331 | .id_table = wm8900_i2c_id, | 1331 | .id_table = wm8900_i2c_id, |
1332 | }; | 1332 | }; |
1333 | #endif | 1333 | #endif |
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 839414f9e2ed..134e41c870b9 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -2020,8 +2020,8 @@ static int wm8903_set_pdata_from_of(struct i2c_client *i2c, | |||
2020 | return 0; | 2020 | return 0; |
2021 | } | 2021 | } |
2022 | 2022 | ||
2023 | static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, | 2023 | static int wm8903_i2c_probe(struct i2c_client *i2c, |
2024 | const struct i2c_device_id *id) | 2024 | const struct i2c_device_id *id) |
2025 | { | 2025 | { |
2026 | struct wm8903_platform_data *pdata = dev_get_platdata(&i2c->dev); | 2026 | struct wm8903_platform_data *pdata = dev_get_platdata(&i2c->dev); |
2027 | struct wm8903_priv *wm8903; | 2027 | struct wm8903_priv *wm8903; |
@@ -2206,7 +2206,7 @@ err: | |||
2206 | return ret; | 2206 | return ret; |
2207 | } | 2207 | } |
2208 | 2208 | ||
2209 | static __devexit int wm8903_i2c_remove(struct i2c_client *client) | 2209 | static int wm8903_i2c_remove(struct i2c_client *client) |
2210 | { | 2210 | { |
2211 | struct wm8903_priv *wm8903 = i2c_get_clientdata(client); | 2211 | struct wm8903_priv *wm8903 = i2c_get_clientdata(client); |
2212 | 2212 | ||
@@ -2237,7 +2237,7 @@ static struct i2c_driver wm8903_i2c_driver = { | |||
2237 | .of_match_table = wm8903_of_match, | 2237 | .of_match_table = wm8903_of_match, |
2238 | }, | 2238 | }, |
2239 | .probe = wm8903_i2c_probe, | 2239 | .probe = wm8903_i2c_probe, |
2240 | .remove = __devexit_p(wm8903_i2c_remove), | 2240 | .remove = wm8903_i2c_remove, |
2241 | .id_table = wm8903_i2c_id, | 2241 | .id_table = wm8903_i2c_id, |
2242 | }; | 2242 | }; |
2243 | 2243 | ||
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 7c8df52a8d9d..3ff195c541db 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c | |||
@@ -2111,8 +2111,8 @@ static const struct regmap_config wm8904_regmap = { | |||
2111 | .num_reg_defaults = ARRAY_SIZE(wm8904_reg_defaults), | 2111 | .num_reg_defaults = ARRAY_SIZE(wm8904_reg_defaults), |
2112 | }; | 2112 | }; |
2113 | 2113 | ||
2114 | static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, | 2114 | static int wm8904_i2c_probe(struct i2c_client *i2c, |
2115 | const struct i2c_device_id *id) | 2115 | const struct i2c_device_id *id) |
2116 | { | 2116 | { |
2117 | struct wm8904_priv *wm8904; | 2117 | struct wm8904_priv *wm8904; |
2118 | unsigned int val; | 2118 | unsigned int val; |
@@ -2247,7 +2247,7 @@ err_enable: | |||
2247 | return ret; | 2247 | return ret; |
2248 | } | 2248 | } |
2249 | 2249 | ||
2250 | static __devexit int wm8904_i2c_remove(struct i2c_client *client) | 2250 | static int wm8904_i2c_remove(struct i2c_client *client) |
2251 | { | 2251 | { |
2252 | snd_soc_unregister_codec(&client->dev); | 2252 | snd_soc_unregister_codec(&client->dev); |
2253 | return 0; | 2253 | return 0; |
@@ -2267,7 +2267,7 @@ static struct i2c_driver wm8904_i2c_driver = { | |||
2267 | .owner = THIS_MODULE, | 2267 | .owner = THIS_MODULE, |
2268 | }, | 2268 | }, |
2269 | .probe = wm8904_i2c_probe, | 2269 | .probe = wm8904_i2c_probe, |
2270 | .remove = __devexit_p(wm8904_i2c_remove), | 2270 | .remove = wm8904_i2c_remove, |
2271 | .id_table = wm8904_i2c_id, | 2271 | .id_table = wm8904_i2c_id, |
2272 | }; | 2272 | }; |
2273 | 2273 | ||
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index b20aa4e7c3f9..b1591c61c254 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c | |||
@@ -742,8 +742,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8940 = { | |||
742 | .volatile_register = wm8940_volatile_register, | 742 | .volatile_register = wm8940_volatile_register, |
743 | }; | 743 | }; |
744 | 744 | ||
745 | static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, | 745 | static int wm8940_i2c_probe(struct i2c_client *i2c, |
746 | const struct i2c_device_id *id) | 746 | const struct i2c_device_id *id) |
747 | { | 747 | { |
748 | struct wm8940_priv *wm8940; | 748 | struct wm8940_priv *wm8940; |
749 | int ret; | 749 | int ret; |
@@ -762,7 +762,7 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, | |||
762 | return ret; | 762 | return ret; |
763 | } | 763 | } |
764 | 764 | ||
765 | static __devexit int wm8940_i2c_remove(struct i2c_client *client) | 765 | static int wm8940_i2c_remove(struct i2c_client *client) |
766 | { | 766 | { |
767 | snd_soc_unregister_codec(&client->dev); | 767 | snd_soc_unregister_codec(&client->dev); |
768 | 768 | ||
@@ -781,7 +781,7 @@ static struct i2c_driver wm8940_i2c_driver = { | |||
781 | .owner = THIS_MODULE, | 781 | .owner = THIS_MODULE, |
782 | }, | 782 | }, |
783 | .probe = wm8940_i2c_probe, | 783 | .probe = wm8940_i2c_probe, |
784 | .remove = __devexit_p(wm8940_i2c_remove), | 784 | .remove = wm8940_i2c_remove, |
785 | .id_table = wm8940_i2c_id, | 785 | .id_table = wm8940_i2c_id, |
786 | }; | 786 | }; |
787 | 787 | ||
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 | ||
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index cf09cb625a7b..9bb927325993 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
@@ -1028,8 +1028,8 @@ static const struct regmap_config wm8960_regmap = { | |||
1028 | .volatile_reg = wm8960_volatile, | 1028 | .volatile_reg = wm8960_volatile, |
1029 | }; | 1029 | }; |
1030 | 1030 | ||
1031 | static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, | 1031 | static int wm8960_i2c_probe(struct i2c_client *i2c, |
1032 | const struct i2c_device_id *id) | 1032 | const struct i2c_device_id *id) |
1033 | { | 1033 | { |
1034 | struct wm8960_data *pdata = dev_get_platdata(&i2c->dev); | 1034 | struct wm8960_data *pdata = dev_get_platdata(&i2c->dev); |
1035 | struct wm8960_priv *wm8960; | 1035 | struct wm8960_priv *wm8960; |
@@ -1062,7 +1062,7 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, | |||
1062 | return ret; | 1062 | return ret; |
1063 | } | 1063 | } |
1064 | 1064 | ||
1065 | static __devexit int wm8960_i2c_remove(struct i2c_client *client) | 1065 | static int wm8960_i2c_remove(struct i2c_client *client) |
1066 | { | 1066 | { |
1067 | snd_soc_unregister_codec(&client->dev); | 1067 | snd_soc_unregister_codec(&client->dev); |
1068 | return 0; | 1068 | return 0; |
@@ -1080,7 +1080,7 @@ static struct i2c_driver wm8960_i2c_driver = { | |||
1080 | .owner = THIS_MODULE, | 1080 | .owner = THIS_MODULE, |
1081 | }, | 1081 | }, |
1082 | .probe = wm8960_i2c_probe, | 1082 | .probe = wm8960_i2c_probe, |
1083 | .remove = __devexit_p(wm8960_i2c_remove), | 1083 | .remove = wm8960_i2c_remove, |
1084 | .id_table = wm8960_i2c_id, | 1084 | .id_table = wm8960_i2c_id, |
1085 | }; | 1085 | }; |
1086 | 1086 | ||
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index f387670d0d75..900328e28a15 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c | |||
@@ -937,8 +937,8 @@ static const struct regmap_config wm8961_regmap = { | |||
937 | .readable_reg = wm8961_readable, | 937 | .readable_reg = wm8961_readable, |
938 | }; | 938 | }; |
939 | 939 | ||
940 | static __devinit int wm8961_i2c_probe(struct i2c_client *i2c, | 940 | static int wm8961_i2c_probe(struct i2c_client *i2c, |
941 | const struct i2c_device_id *id) | 941 | const struct i2c_device_id *id) |
942 | { | 942 | { |
943 | struct wm8961_priv *wm8961; | 943 | struct wm8961_priv *wm8961; |
944 | unsigned int val; | 944 | unsigned int val; |
@@ -993,7 +993,7 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c, | |||
993 | return ret; | 993 | return ret; |
994 | } | 994 | } |
995 | 995 | ||
996 | static __devexit int wm8961_i2c_remove(struct i2c_client *client) | 996 | static int wm8961_i2c_remove(struct i2c_client *client) |
997 | { | 997 | { |
998 | snd_soc_unregister_codec(&client->dev); | 998 | snd_soc_unregister_codec(&client->dev); |
999 | 999 | ||
@@ -1012,7 +1012,7 @@ static struct i2c_driver wm8961_i2c_driver = { | |||
1012 | .owner = THIS_MODULE, | 1012 | .owner = THIS_MODULE, |
1013 | }, | 1013 | }, |
1014 | .probe = wm8961_i2c_probe, | 1014 | .probe = wm8961_i2c_probe, |
1015 | .remove = __devexit_p(wm8961_i2c_remove), | 1015 | .remove = wm8961_i2c_remove, |
1016 | .id_table = wm8961_i2c_id, | 1016 | .id_table = wm8961_i2c_id, |
1017 | }; | 1017 | }; |
1018 | 1018 | ||
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 8fd38cb4ba48..bd4b0db4cdaa 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c | |||
@@ -3588,8 +3588,8 @@ static const struct regmap_config wm8962_regmap = { | |||
3588 | .cache_type = REGCACHE_RBTREE, | 3588 | .cache_type = REGCACHE_RBTREE, |
3589 | }; | 3589 | }; |
3590 | 3590 | ||
3591 | static __devinit int wm8962_i2c_probe(struct i2c_client *i2c, | 3591 | static int wm8962_i2c_probe(struct i2c_client *i2c, |
3592 | const struct i2c_device_id *id) | 3592 | const struct i2c_device_id *id) |
3593 | { | 3593 | { |
3594 | struct wm8962_pdata *pdata = dev_get_platdata(&i2c->dev); | 3594 | struct wm8962_pdata *pdata = dev_get_platdata(&i2c->dev); |
3595 | struct wm8962_priv *wm8962; | 3595 | struct wm8962_priv *wm8962; |
@@ -3699,7 +3699,7 @@ err: | |||
3699 | return ret; | 3699 | return ret; |
3700 | } | 3700 | } |
3701 | 3701 | ||
3702 | static __devexit int wm8962_i2c_remove(struct i2c_client *client) | 3702 | static int wm8962_i2c_remove(struct i2c_client *client) |
3703 | { | 3703 | { |
3704 | snd_soc_unregister_codec(&client->dev); | 3704 | snd_soc_unregister_codec(&client->dev); |
3705 | return 0; | 3705 | return 0; |
@@ -3765,7 +3765,7 @@ static struct i2c_driver wm8962_i2c_driver = { | |||
3765 | .pm = &wm8962_pm, | 3765 | .pm = &wm8962_pm, |
3766 | }, | 3766 | }, |
3767 | .probe = wm8962_i2c_probe, | 3767 | .probe = wm8962_i2c_probe, |
3768 | .remove = __devexit_p(wm8962_i2c_remove), | 3768 | .remove = wm8962_i2c_remove, |
3769 | .id_table = wm8962_i2c_id, | 3769 | .id_table = wm8962_i2c_id, |
3770 | }; | 3770 | }; |
3771 | 3771 | ||
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 70dd27e94514..67aba78a7ca5 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c | |||
@@ -717,8 +717,8 @@ static const struct regmap_config wm8971_regmap = { | |||
717 | .cache_type = REGCACHE_RBTREE, | 717 | .cache_type = REGCACHE_RBTREE, |
718 | }; | 718 | }; |
719 | 719 | ||
720 | static __devinit int wm8971_i2c_probe(struct i2c_client *i2c, | 720 | static int wm8971_i2c_probe(struct i2c_client *i2c, |
721 | const struct i2c_device_id *id) | 721 | const struct i2c_device_id *id) |
722 | { | 722 | { |
723 | struct wm8971_priv *wm8971; | 723 | struct wm8971_priv *wm8971; |
724 | struct regmap *regmap; | 724 | struct regmap *regmap; |
@@ -741,7 +741,7 @@ static __devinit int wm8971_i2c_probe(struct i2c_client *i2c, | |||
741 | return ret; | 741 | return ret; |
742 | } | 742 | } |
743 | 743 | ||
744 | static __devexit int wm8971_i2c_remove(struct i2c_client *client) | 744 | static int wm8971_i2c_remove(struct i2c_client *client) |
745 | { | 745 | { |
746 | snd_soc_unregister_codec(&client->dev); | 746 | snd_soc_unregister_codec(&client->dev); |
747 | return 0; | 747 | return 0; |
@@ -759,7 +759,7 @@ static struct i2c_driver wm8971_i2c_driver = { | |||
759 | .owner = THIS_MODULE, | 759 | .owner = THIS_MODULE, |
760 | }, | 760 | }, |
761 | .probe = wm8971_i2c_probe, | 761 | .probe = wm8971_i2c_probe, |
762 | .remove = __devexit_p(wm8971_i2c_remove), | 762 | .remove = wm8971_i2c_remove, |
763 | .id_table = wm8971_i2c_id, | 763 | .id_table = wm8971_i2c_id, |
764 | }; | 764 | }; |
765 | 765 | ||
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 9a39511af52a..ea58b73e86b2 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c | |||
@@ -625,8 +625,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8974 = { | |||
625 | .num_dapm_routes = ARRAY_SIZE(wm8974_dapm_routes), | 625 | .num_dapm_routes = ARRAY_SIZE(wm8974_dapm_routes), |
626 | }; | 626 | }; |
627 | 627 | ||
628 | static __devinit int wm8974_i2c_probe(struct i2c_client *i2c, | 628 | static int wm8974_i2c_probe(struct i2c_client *i2c, |
629 | const struct i2c_device_id *id) | 629 | const struct i2c_device_id *id) |
630 | { | 630 | { |
631 | int ret; | 631 | int ret; |
632 | 632 | ||
@@ -636,7 +636,7 @@ static __devinit int wm8974_i2c_probe(struct i2c_client *i2c, | |||
636 | return ret; | 636 | return ret; |
637 | } | 637 | } |
638 | 638 | ||
639 | static __devexit int wm8974_i2c_remove(struct i2c_client *client) | 639 | static int wm8974_i2c_remove(struct i2c_client *client) |
640 | { | 640 | { |
641 | snd_soc_unregister_codec(&client->dev); | 641 | snd_soc_unregister_codec(&client->dev); |
642 | 642 | ||
@@ -655,7 +655,7 @@ static struct i2c_driver wm8974_i2c_driver = { | |||
655 | .owner = THIS_MODULE, | 655 | .owner = THIS_MODULE, |
656 | }, | 656 | }, |
657 | .probe = wm8974_i2c_probe, | 657 | .probe = wm8974_i2c_probe, |
658 | .remove = __devexit_p(wm8974_i2c_remove), | 658 | .remove = wm8974_i2c_remove, |
659 | .id_table = wm8974_i2c_id, | 659 | .id_table = wm8974_i2c_id, |
660 | }; | 660 | }; |
661 | 661 | ||
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index ef467001c3d5..f347af3a67c2 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -1035,8 +1035,8 @@ static const struct regmap_config wm8978_regmap_config = { | |||
1035 | .num_reg_defaults = ARRAY_SIZE(wm8978_reg_defaults), | 1035 | .num_reg_defaults = ARRAY_SIZE(wm8978_reg_defaults), |
1036 | }; | 1036 | }; |
1037 | 1037 | ||
1038 | static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, | 1038 | static int wm8978_i2c_probe(struct i2c_client *i2c, |
1039 | const struct i2c_device_id *id) | 1039 | const struct i2c_device_id *id) |
1040 | { | 1040 | { |
1041 | struct wm8978_priv *wm8978; | 1041 | struct wm8978_priv *wm8978; |
1042 | int ret; | 1042 | int ret; |
@@ -1072,7 +1072,7 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, | |||
1072 | return 0; | 1072 | return 0; |
1073 | } | 1073 | } |
1074 | 1074 | ||
1075 | static __devexit int wm8978_i2c_remove(struct i2c_client *client) | 1075 | static int wm8978_i2c_remove(struct i2c_client *client) |
1076 | { | 1076 | { |
1077 | snd_soc_unregister_codec(&client->dev); | 1077 | snd_soc_unregister_codec(&client->dev); |
1078 | 1078 | ||
@@ -1091,7 +1091,7 @@ static struct i2c_driver wm8978_i2c_driver = { | |||
1091 | .owner = THIS_MODULE, | 1091 | .owner = THIS_MODULE, |
1092 | }, | 1092 | }, |
1093 | .probe = wm8978_i2c_probe, | 1093 | .probe = wm8978_i2c_probe, |
1094 | .remove = __devexit_p(wm8978_i2c_remove), | 1094 | .remove = wm8978_i2c_remove, |
1095 | .id_table = wm8978_i2c_id, | 1095 | .id_table = wm8978_i2c_id, |
1096 | }; | 1096 | }; |
1097 | 1097 | ||
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 |
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index 7b3f4097609b..ab3782657ac8 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c | |||
@@ -1111,7 +1111,7 @@ static const struct regmap_config wm8985_regmap = { | |||
1111 | }; | 1111 | }; |
1112 | 1112 | ||
1113 | #if defined(CONFIG_SPI_MASTER) | 1113 | #if defined(CONFIG_SPI_MASTER) |
1114 | static int __devinit wm8985_spi_probe(struct spi_device *spi) | 1114 | static int wm8985_spi_probe(struct spi_device *spi) |
1115 | { | 1115 | { |
1116 | struct wm8985_priv *wm8985; | 1116 | struct wm8985_priv *wm8985; |
1117 | int ret; | 1117 | int ret; |
@@ -1135,7 +1135,7 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi) | |||
1135 | return ret; | 1135 | return ret; |
1136 | } | 1136 | } |
1137 | 1137 | ||
1138 | static int __devexit wm8985_spi_remove(struct spi_device *spi) | 1138 | static int wm8985_spi_remove(struct spi_device *spi) |
1139 | { | 1139 | { |
1140 | snd_soc_unregister_codec(&spi->dev); | 1140 | snd_soc_unregister_codec(&spi->dev); |
1141 | return 0; | 1141 | return 0; |
@@ -1147,13 +1147,13 @@ static struct spi_driver wm8985_spi_driver = { | |||
1147 | .owner = THIS_MODULE, | 1147 | .owner = THIS_MODULE, |
1148 | }, | 1148 | }, |
1149 | .probe = wm8985_spi_probe, | 1149 | .probe = wm8985_spi_probe, |
1150 | .remove = __devexit_p(wm8985_spi_remove) | 1150 | .remove = wm8985_spi_remove |
1151 | }; | 1151 | }; |
1152 | #endif | 1152 | #endif |
1153 | 1153 | ||
1154 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 1154 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
1155 | static __devinit int wm8985_i2c_probe(struct i2c_client *i2c, | 1155 | static int wm8985_i2c_probe(struct i2c_client *i2c, |
1156 | const struct i2c_device_id *id) | 1156 | const struct i2c_device_id *id) |
1157 | { | 1157 | { |
1158 | struct wm8985_priv *wm8985; | 1158 | struct wm8985_priv *wm8985; |
1159 | int ret; | 1159 | int ret; |
@@ -1177,7 +1177,7 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c, | |||
1177 | return ret; | 1177 | return ret; |
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | static __devexit int wm8985_i2c_remove(struct i2c_client *i2c) | 1180 | static int wm8985_i2c_remove(struct i2c_client *i2c) |
1181 | { | 1181 | { |
1182 | snd_soc_unregister_codec(&i2c->dev); | 1182 | snd_soc_unregister_codec(&i2c->dev); |
1183 | return 0; | 1183 | return 0; |
@@ -1195,7 +1195,7 @@ static struct i2c_driver wm8985_i2c_driver = { | |||
1195 | .owner = THIS_MODULE, | 1195 | .owner = THIS_MODULE, |
1196 | }, | 1196 | }, |
1197 | .probe = wm8985_i2c_probe, | 1197 | .probe = wm8985_i2c_probe, |
1198 | .remove = __devexit_p(wm8985_i2c_remove), | 1198 | .remove = wm8985_i2c_remove, |
1199 | .id_table = wm8985_i2c_id | 1199 | .id_table = wm8985_i2c_id |
1200 | }; | 1200 | }; |
1201 | #endif | 1201 | #endif |
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index 715788de442e..39b9acceb595 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c | |||
@@ -872,7 +872,7 @@ static struct regmap_config wm8988_regmap = { | |||
872 | }; | 872 | }; |
873 | 873 | ||
874 | #if defined(CONFIG_SPI_MASTER) | 874 | #if defined(CONFIG_SPI_MASTER) |
875 | static int __devinit wm8988_spi_probe(struct spi_device *spi) | 875 | static int wm8988_spi_probe(struct spi_device *spi) |
876 | { | 876 | { |
877 | struct wm8988_priv *wm8988; | 877 | struct wm8988_priv *wm8988; |
878 | int ret; | 878 | int ret; |
@@ -896,7 +896,7 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi) | |||
896 | return ret; | 896 | return ret; |
897 | } | 897 | } |
898 | 898 | ||
899 | static int __devexit wm8988_spi_remove(struct spi_device *spi) | 899 | static int wm8988_spi_remove(struct spi_device *spi) |
900 | { | 900 | { |
901 | snd_soc_unregister_codec(&spi->dev); | 901 | snd_soc_unregister_codec(&spi->dev); |
902 | return 0; | 902 | return 0; |
@@ -908,13 +908,13 @@ static struct spi_driver wm8988_spi_driver = { | |||
908 | .owner = THIS_MODULE, | 908 | .owner = THIS_MODULE, |
909 | }, | 909 | }, |
910 | .probe = wm8988_spi_probe, | 910 | .probe = wm8988_spi_probe, |
911 | .remove = __devexit_p(wm8988_spi_remove), | 911 | .remove = wm8988_spi_remove, |
912 | }; | 912 | }; |
913 | #endif /* CONFIG_SPI_MASTER */ | 913 | #endif /* CONFIG_SPI_MASTER */ |
914 | 914 | ||
915 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 915 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
916 | static __devinit int wm8988_i2c_probe(struct i2c_client *i2c, | 916 | static int wm8988_i2c_probe(struct i2c_client *i2c, |
917 | const struct i2c_device_id *id) | 917 | const struct i2c_device_id *id) |
918 | { | 918 | { |
919 | struct wm8988_priv *wm8988; | 919 | struct wm8988_priv *wm8988; |
920 | int ret; | 920 | int ret; |
@@ -938,7 +938,7 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c, | |||
938 | return ret; | 938 | return ret; |
939 | } | 939 | } |
940 | 940 | ||
941 | static __devexit int wm8988_i2c_remove(struct i2c_client *client) | 941 | static int wm8988_i2c_remove(struct i2c_client *client) |
942 | { | 942 | { |
943 | snd_soc_unregister_codec(&client->dev); | 943 | snd_soc_unregister_codec(&client->dev); |
944 | return 0; | 944 | return 0; |
@@ -956,7 +956,7 @@ static struct i2c_driver wm8988_i2c_driver = { | |||
956 | .owner = THIS_MODULE, | 956 | .owner = THIS_MODULE, |
957 | }, | 957 | }, |
958 | .probe = wm8988_i2c_probe, | 958 | .probe = wm8988_i2c_probe, |
959 | .remove = __devexit_p(wm8988_i2c_remove), | 959 | .remove = wm8988_i2c_remove, |
960 | .id_table = wm8988_i2c_id, | 960 | .id_table = wm8988_i2c_id, |
961 | }; | 961 | }; |
962 | #endif | 962 | #endif |
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index c28c83e5395d..837978e16e9d 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -1382,8 +1382,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8990 = { | |||
1382 | }; | 1382 | }; |
1383 | 1383 | ||
1384 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 1384 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
1385 | static __devinit int wm8990_i2c_probe(struct i2c_client *i2c, | 1385 | static int wm8990_i2c_probe(struct i2c_client *i2c, |
1386 | const struct i2c_device_id *id) | 1386 | const struct i2c_device_id *id) |
1387 | { | 1387 | { |
1388 | struct wm8990_priv *wm8990; | 1388 | struct wm8990_priv *wm8990; |
1389 | int ret; | 1389 | int ret; |
@@ -1401,7 +1401,7 @@ static __devinit int wm8990_i2c_probe(struct i2c_client *i2c, | |||
1401 | return ret; | 1401 | return ret; |
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | static __devexit int wm8990_i2c_remove(struct i2c_client *client) | 1404 | static int wm8990_i2c_remove(struct i2c_client *client) |
1405 | { | 1405 | { |
1406 | snd_soc_unregister_codec(&client->dev); | 1406 | snd_soc_unregister_codec(&client->dev); |
1407 | 1407 | ||
@@ -1420,7 +1420,7 @@ static struct i2c_driver wm8990_i2c_driver = { | |||
1420 | .owner = THIS_MODULE, | 1420 | .owner = THIS_MODULE, |
1421 | }, | 1421 | }, |
1422 | .probe = wm8990_i2c_probe, | 1422 | .probe = wm8990_i2c_probe, |
1423 | .remove = __devexit_p(wm8990_i2c_remove), | 1423 | .remove = wm8990_i2c_remove, |
1424 | .id_table = wm8990_i2c_id, | 1424 | .id_table = wm8990_i2c_id, |
1425 | }; | 1425 | }; |
1426 | #endif | 1426 | #endif |
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c index fe439f027e10..3a39df7a3829 100644 --- a/sound/soc/codecs/wm8991.c +++ b/sound/soc/codecs/wm8991.c | |||
@@ -1357,8 +1357,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8991 = { | |||
1357 | .reg_cache_default = wm8991_reg_defs | 1357 | .reg_cache_default = wm8991_reg_defs |
1358 | }; | 1358 | }; |
1359 | 1359 | ||
1360 | static __devinit int wm8991_i2c_probe(struct i2c_client *i2c, | 1360 | static int wm8991_i2c_probe(struct i2c_client *i2c, |
1361 | const struct i2c_device_id *id) | 1361 | const struct i2c_device_id *id) |
1362 | { | 1362 | { |
1363 | struct wm8991_priv *wm8991; | 1363 | struct wm8991_priv *wm8991; |
1364 | int ret; | 1364 | int ret; |
@@ -1376,7 +1376,7 @@ static __devinit int wm8991_i2c_probe(struct i2c_client *i2c, | |||
1376 | return ret; | 1376 | return ret; |
1377 | } | 1377 | } |
1378 | 1378 | ||
1379 | static __devexit int wm8991_i2c_remove(struct i2c_client *client) | 1379 | static int wm8991_i2c_remove(struct i2c_client *client) |
1380 | { | 1380 | { |
1381 | snd_soc_unregister_codec(&client->dev); | 1381 | snd_soc_unregister_codec(&client->dev); |
1382 | 1382 | ||
@@ -1395,7 +1395,7 @@ static struct i2c_driver wm8991_i2c_driver = { | |||
1395 | .owner = THIS_MODULE, | 1395 | .owner = THIS_MODULE, |
1396 | }, | 1396 | }, |
1397 | .probe = wm8991_i2c_probe, | 1397 | .probe = wm8991_i2c_probe, |
1398 | .remove = __devexit_p(wm8991_i2c_remove), | 1398 | .remove = wm8991_i2c_remove, |
1399 | .id_table = wm8991_i2c_id, | 1399 | .id_table = wm8991_i2c_id, |
1400 | }; | 1400 | }; |
1401 | 1401 | ||
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 347a359a7c86..433d59a0f3ef 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c | |||
@@ -1645,8 +1645,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8993 = { | |||
1645 | .set_bias_level = wm8993_set_bias_level, | 1645 | .set_bias_level = wm8993_set_bias_level, |
1646 | }; | 1646 | }; |
1647 | 1647 | ||
1648 | static __devinit int wm8993_i2c_probe(struct i2c_client *i2c, | 1648 | static int wm8993_i2c_probe(struct i2c_client *i2c, |
1649 | const struct i2c_device_id *id) | 1649 | const struct i2c_device_id *id) |
1650 | { | 1650 | { |
1651 | struct wm8993_priv *wm8993; | 1651 | struct wm8993_priv *wm8993; |
1652 | unsigned int reg; | 1652 | unsigned int reg; |
@@ -1745,7 +1745,7 @@ err_enable: | |||
1745 | return ret; | 1745 | return ret; |
1746 | } | 1746 | } |
1747 | 1747 | ||
1748 | static __devexit int wm8993_i2c_remove(struct i2c_client *i2c) | 1748 | static int wm8993_i2c_remove(struct i2c_client *i2c) |
1749 | { | 1749 | { |
1750 | struct wm8993_priv *wm8993 = i2c_get_clientdata(i2c); | 1750 | struct wm8993_priv *wm8993 = i2c_get_clientdata(i2c); |
1751 | 1751 | ||
@@ -1769,7 +1769,7 @@ static struct i2c_driver wm8993_i2c_driver = { | |||
1769 | .owner = THIS_MODULE, | 1769 | .owner = THIS_MODULE, |
1770 | }, | 1770 | }, |
1771 | .probe = wm8993_i2c_probe, | 1771 | .probe = wm8993_i2c_probe, |
1772 | .remove = __devexit_p(wm8993_i2c_remove), | 1772 | .remove = wm8993_i2c_remove, |
1773 | .id_table = wm8993_i2c_id, | 1773 | .id_table = wm8993_i2c_id, |
1774 | }; | 1774 | }; |
1775 | 1775 | ||
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 60b34ff8179b..3b269fa226bd 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -4287,7 +4287,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8994 = { | |||
4287 | .set_bias_level = wm8994_set_bias_level, | 4287 | .set_bias_level = wm8994_set_bias_level, |
4288 | }; | 4288 | }; |
4289 | 4289 | ||
4290 | static int __devinit wm8994_probe(struct platform_device *pdev) | 4290 | static int wm8994_probe(struct platform_device *pdev) |
4291 | { | 4291 | { |
4292 | struct wm8994_priv *wm8994; | 4292 | struct wm8994_priv *wm8994; |
4293 | 4293 | ||
@@ -4303,7 +4303,7 @@ static int __devinit wm8994_probe(struct platform_device *pdev) | |||
4303 | wm8994_dai, ARRAY_SIZE(wm8994_dai)); | 4303 | wm8994_dai, ARRAY_SIZE(wm8994_dai)); |
4304 | } | 4304 | } |
4305 | 4305 | ||
4306 | static int __devexit wm8994_remove(struct platform_device *pdev) | 4306 | static int wm8994_remove(struct platform_device *pdev) |
4307 | { | 4307 | { |
4308 | snd_soc_unregister_codec(&pdev->dev); | 4308 | snd_soc_unregister_codec(&pdev->dev); |
4309 | return 0; | 4309 | return 0; |
@@ -4347,7 +4347,7 @@ static struct platform_driver wm8994_codec_driver = { | |||
4347 | .pm = &wm8994_pm_ops, | 4347 | .pm = &wm8994_pm_ops, |
4348 | }, | 4348 | }, |
4349 | .probe = wm8994_probe, | 4349 | .probe = wm8994_probe, |
4350 | .remove = __devexit_p(wm8994_remove), | 4350 | .remove = wm8994_remove, |
4351 | }; | 4351 | }; |
4352 | 4352 | ||
4353 | module_platform_driver(wm8994_codec_driver); | 4353 | module_platform_driver(wm8994_codec_driver); |
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index f1a7cf147af0..90a65c427541 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c | |||
@@ -2256,7 +2256,7 @@ static struct regmap_config wm8995_regmap = { | |||
2256 | }; | 2256 | }; |
2257 | 2257 | ||
2258 | #if defined(CONFIG_SPI_MASTER) | 2258 | #if defined(CONFIG_SPI_MASTER) |
2259 | static int __devinit wm8995_spi_probe(struct spi_device *spi) | 2259 | static int wm8995_spi_probe(struct spi_device *spi) |
2260 | { | 2260 | { |
2261 | struct wm8995_priv *wm8995; | 2261 | struct wm8995_priv *wm8995; |
2262 | int ret; | 2262 | int ret; |
@@ -2280,7 +2280,7 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi) | |||
2280 | return ret; | 2280 | return ret; |
2281 | } | 2281 | } |
2282 | 2282 | ||
2283 | static int __devexit wm8995_spi_remove(struct spi_device *spi) | 2283 | static int wm8995_spi_remove(struct spi_device *spi) |
2284 | { | 2284 | { |
2285 | snd_soc_unregister_codec(&spi->dev); | 2285 | snd_soc_unregister_codec(&spi->dev); |
2286 | return 0; | 2286 | return 0; |
@@ -2292,13 +2292,13 @@ static struct spi_driver wm8995_spi_driver = { | |||
2292 | .owner = THIS_MODULE, | 2292 | .owner = THIS_MODULE, |
2293 | }, | 2293 | }, |
2294 | .probe = wm8995_spi_probe, | 2294 | .probe = wm8995_spi_probe, |
2295 | .remove = __devexit_p(wm8995_spi_remove) | 2295 | .remove = wm8995_spi_remove |
2296 | }; | 2296 | }; |
2297 | #endif | 2297 | #endif |
2298 | 2298 | ||
2299 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 2299 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
2300 | static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, | 2300 | static int wm8995_i2c_probe(struct i2c_client *i2c, |
2301 | const struct i2c_device_id *id) | 2301 | const struct i2c_device_id *id) |
2302 | { | 2302 | { |
2303 | struct wm8995_priv *wm8995; | 2303 | struct wm8995_priv *wm8995; |
2304 | int ret; | 2304 | int ret; |
@@ -2325,7 +2325,7 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, | |||
2325 | return ret; | 2325 | return ret; |
2326 | } | 2326 | } |
2327 | 2327 | ||
2328 | static __devexit int wm8995_i2c_remove(struct i2c_client *client) | 2328 | static int wm8995_i2c_remove(struct i2c_client *client) |
2329 | { | 2329 | { |
2330 | snd_soc_unregister_codec(&client->dev); | 2330 | snd_soc_unregister_codec(&client->dev); |
2331 | return 0; | 2331 | return 0; |
@@ -2344,7 +2344,7 @@ static struct i2c_driver wm8995_i2c_driver = { | |||
2344 | .owner = THIS_MODULE, | 2344 | .owner = THIS_MODULE, |
2345 | }, | 2345 | }, |
2346 | .probe = wm8995_i2c_probe, | 2346 | .probe = wm8995_i2c_probe, |
2347 | .remove = __devexit_p(wm8995_i2c_remove), | 2347 | .remove = wm8995_i2c_remove, |
2348 | .id_table = wm8995_i2c_id | 2348 | .id_table = wm8995_i2c_id |
2349 | }; | 2349 | }; |
2350 | #endif | 2350 | #endif |
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 6dcb02c3666f..46fe83d2b224 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c | |||
@@ -2765,8 +2765,8 @@ static struct snd_soc_dai_driver wm8996_dai[] = { | |||
2765 | }, | 2765 | }, |
2766 | }; | 2766 | }; |
2767 | 2767 | ||
2768 | static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, | 2768 | static int wm8996_i2c_probe(struct i2c_client *i2c, |
2769 | const struct i2c_device_id *id) | 2769 | const struct i2c_device_id *id) |
2770 | { | 2770 | { |
2771 | struct wm8996_priv *wm8996; | 2771 | struct wm8996_priv *wm8996; |
2772 | int ret, i; | 2772 | int ret, i; |
@@ -3077,7 +3077,7 @@ err: | |||
3077 | return ret; | 3077 | return ret; |
3078 | } | 3078 | } |
3079 | 3079 | ||
3080 | static __devexit int wm8996_i2c_remove(struct i2c_client *client) | 3080 | static int wm8996_i2c_remove(struct i2c_client *client) |
3081 | { | 3081 | { |
3082 | struct wm8996_priv *wm8996 = i2c_get_clientdata(client); | 3082 | struct wm8996_priv *wm8996 = i2c_get_clientdata(client); |
3083 | int i; | 3083 | int i; |
@@ -3107,7 +3107,7 @@ static struct i2c_driver wm8996_i2c_driver = { | |||
3107 | .owner = THIS_MODULE, | 3107 | .owner = THIS_MODULE, |
3108 | }, | 3108 | }, |
3109 | .probe = wm8996_i2c_probe, | 3109 | .probe = wm8996_i2c_probe, |
3110 | .remove = __devexit_p(wm8996_i2c_remove), | 3110 | .remove = wm8996_i2c_remove, |
3111 | .id_table = wm8996_i2c_id, | 3111 | .id_table = wm8996_i2c_id, |
3112 | }; | 3112 | }; |
3113 | 3113 | ||
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 860144e85e06..630b3d776ec2 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c | |||
@@ -1327,8 +1327,8 @@ static const struct regmap_config wm9081_regmap = { | |||
1327 | }; | 1327 | }; |
1328 | 1328 | ||
1329 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 1329 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
1330 | static __devinit int wm9081_i2c_probe(struct i2c_client *i2c, | 1330 | static int wm9081_i2c_probe(struct i2c_client *i2c, |
1331 | const struct i2c_device_id *id) | 1331 | const struct i2c_device_id *id) |
1332 | { | 1332 | { |
1333 | struct wm9081_priv *wm9081; | 1333 | struct wm9081_priv *wm9081; |
1334 | unsigned int reg; | 1334 | unsigned int reg; |
@@ -1386,7 +1386,7 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c, | |||
1386 | return 0; | 1386 | return 0; |
1387 | } | 1387 | } |
1388 | 1388 | ||
1389 | static __devexit int wm9081_i2c_remove(struct i2c_client *client) | 1389 | static int wm9081_i2c_remove(struct i2c_client *client) |
1390 | { | 1390 | { |
1391 | snd_soc_unregister_codec(&client->dev); | 1391 | snd_soc_unregister_codec(&client->dev); |
1392 | return 0; | 1392 | return 0; |
@@ -1404,7 +1404,7 @@ static struct i2c_driver wm9081_i2c_driver = { | |||
1404 | .owner = THIS_MODULE, | 1404 | .owner = THIS_MODULE, |
1405 | }, | 1405 | }, |
1406 | .probe = wm9081_i2c_probe, | 1406 | .probe = wm9081_i2c_probe, |
1407 | .remove = __devexit_p(wm9081_i2c_remove), | 1407 | .remove = wm9081_i2c_remove, |
1408 | .id_table = wm9081_i2c_id, | 1408 | .id_table = wm9081_i2c_id, |
1409 | }; | 1409 | }; |
1410 | #endif | 1410 | #endif |
diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c index bb55a70a104a..a07fe1618eec 100644 --- a/sound/soc/codecs/wm9090.c +++ b/sound/soc/codecs/wm9090.c | |||
@@ -664,7 +664,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, | |||
664 | return 0; | 664 | return 0; |
665 | } | 665 | } |
666 | 666 | ||
667 | static int __devexit wm9090_i2c_remove(struct i2c_client *i2c) | 667 | static int wm9090_i2c_remove(struct i2c_client *i2c) |
668 | { | 668 | { |
669 | snd_soc_unregister_codec(&i2c->dev); | 669 | snd_soc_unregister_codec(&i2c->dev); |
670 | return 0; | 670 | return 0; |
@@ -683,7 +683,7 @@ static struct i2c_driver wm9090_i2c_driver = { | |||
683 | .owner = THIS_MODULE, | 683 | .owner = THIS_MODULE, |
684 | }, | 684 | }, |
685 | .probe = wm9090_i2c_probe, | 685 | .probe = wm9090_i2c_probe, |
686 | .remove = __devexit_p(wm9090_i2c_remove), | 686 | .remove = wm9090_i2c_remove, |
687 | .id_table = wm9090_id, | 687 | .id_table = wm9090_id, |
688 | }; | 688 | }; |
689 | 689 | ||
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index e8e782a0c78d..05b1f346695b 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c | |||
@@ -382,13 +382,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9705 = { | |||
382 | .num_dapm_routes = ARRAY_SIZE(wm9705_audio_map), | 382 | .num_dapm_routes = ARRAY_SIZE(wm9705_audio_map), |
383 | }; | 383 | }; |
384 | 384 | ||
385 | static __devinit int wm9705_probe(struct platform_device *pdev) | 385 | static int wm9705_probe(struct platform_device *pdev) |
386 | { | 386 | { |
387 | return snd_soc_register_codec(&pdev->dev, | 387 | return snd_soc_register_codec(&pdev->dev, |
388 | &soc_codec_dev_wm9705, wm9705_dai, ARRAY_SIZE(wm9705_dai)); | 388 | &soc_codec_dev_wm9705, wm9705_dai, ARRAY_SIZE(wm9705_dai)); |
389 | } | 389 | } |
390 | 390 | ||
391 | static int __devexit wm9705_remove(struct platform_device *pdev) | 391 | static int wm9705_remove(struct platform_device *pdev) |
392 | { | 392 | { |
393 | snd_soc_unregister_codec(&pdev->dev); | 393 | snd_soc_unregister_codec(&pdev->dev); |
394 | return 0; | 394 | return 0; |
@@ -401,7 +401,7 @@ static struct platform_driver wm9705_codec_driver = { | |||
401 | }, | 401 | }, |
402 | 402 | ||
403 | .probe = wm9705_probe, | 403 | .probe = wm9705_probe, |
404 | .remove = __devexit_p(wm9705_remove), | 404 | .remove = wm9705_remove, |
405 | }; | 405 | }; |
406 | 406 | ||
407 | module_platform_driver(wm9705_codec_driver); | 407 | module_platform_driver(wm9705_codec_driver); |
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 4dd73ea08d0b..8e9a6a3eeb1a 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
@@ -685,13 +685,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = { | |||
685 | .num_dapm_routes = ARRAY_SIZE(wm9712_audio_map), | 685 | .num_dapm_routes = ARRAY_SIZE(wm9712_audio_map), |
686 | }; | 686 | }; |
687 | 687 | ||
688 | static __devinit int wm9712_probe(struct platform_device *pdev) | 688 | static int wm9712_probe(struct platform_device *pdev) |
689 | { | 689 | { |
690 | return snd_soc_register_codec(&pdev->dev, | 690 | return snd_soc_register_codec(&pdev->dev, |
691 | &soc_codec_dev_wm9712, wm9712_dai, ARRAY_SIZE(wm9712_dai)); | 691 | &soc_codec_dev_wm9712, wm9712_dai, ARRAY_SIZE(wm9712_dai)); |
692 | } | 692 | } |
693 | 693 | ||
694 | static int __devexit wm9712_remove(struct platform_device *pdev) | 694 | static int wm9712_remove(struct platform_device *pdev) |
695 | { | 695 | { |
696 | snd_soc_unregister_codec(&pdev->dev); | 696 | snd_soc_unregister_codec(&pdev->dev); |
697 | return 0; | 697 | return 0; |
@@ -704,7 +704,7 @@ static struct platform_driver wm9712_codec_driver = { | |||
704 | }, | 704 | }, |
705 | 705 | ||
706 | .probe = wm9712_probe, | 706 | .probe = wm9712_probe, |
707 | .remove = __devexit_p(wm9712_remove), | 707 | .remove = wm9712_remove, |
708 | }; | 708 | }; |
709 | 709 | ||
710 | module_platform_driver(wm9712_codec_driver); | 710 | module_platform_driver(wm9712_codec_driver); |
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 3eb19fb71d17..f7afa68d8c7f 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
@@ -1254,13 +1254,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { | |||
1254 | .num_dapm_routes = ARRAY_SIZE(wm9713_audio_map), | 1254 | .num_dapm_routes = ARRAY_SIZE(wm9713_audio_map), |
1255 | }; | 1255 | }; |
1256 | 1256 | ||
1257 | static __devinit int wm9713_probe(struct platform_device *pdev) | 1257 | static int wm9713_probe(struct platform_device *pdev) |
1258 | { | 1258 | { |
1259 | return snd_soc_register_codec(&pdev->dev, | 1259 | return snd_soc_register_codec(&pdev->dev, |
1260 | &soc_codec_dev_wm9713, wm9713_dai, ARRAY_SIZE(wm9713_dai)); | 1260 | &soc_codec_dev_wm9713, wm9713_dai, ARRAY_SIZE(wm9713_dai)); |
1261 | } | 1261 | } |
1262 | 1262 | ||
1263 | static int __devexit wm9713_remove(struct platform_device *pdev) | 1263 | static int wm9713_remove(struct platform_device *pdev) |
1264 | { | 1264 | { |
1265 | snd_soc_unregister_codec(&pdev->dev); | 1265 | snd_soc_unregister_codec(&pdev->dev); |
1266 | return 0; | 1266 | return 0; |
@@ -1273,7 +1273,7 @@ static struct platform_driver wm9713_codec_driver = { | |||
1273 | }, | 1273 | }, |
1274 | 1274 | ||
1275 | .probe = wm9713_probe, | 1275 | .probe = wm9713_probe, |
1276 | .remove = __devexit_p(wm9713_remove), | 1276 | .remove = wm9713_remove, |
1277 | }; | 1277 | }; |
1278 | 1278 | ||
1279 | module_platform_driver(wm9713_codec_driver); | 1279 | module_platform_driver(wm9713_codec_driver); |