diff options
Diffstat (limited to 'sound/soc/codecs/wm8523.c')
-rw-r--r-- | sound/soc/codecs/wm8523.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c index 25870a4652fb..d3a61d7ea0c5 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c | |||
@@ -117,7 +117,6 @@ static int wm8523_add_widgets(struct snd_soc_codec *codec) | |||
117 | 117 | ||
118 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); | 118 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); |
119 | 119 | ||
120 | snd_soc_dapm_new_widgets(codec); | ||
121 | return 0; | 120 | return 0; |
122 | } | 121 | } |
123 | 122 | ||
@@ -448,17 +447,9 @@ static int wm8523_probe(struct platform_device *pdev) | |||
448 | snd_soc_add_controls(codec, wm8523_snd_controls, | 447 | snd_soc_add_controls(codec, wm8523_snd_controls, |
449 | ARRAY_SIZE(wm8523_snd_controls)); | 448 | ARRAY_SIZE(wm8523_snd_controls)); |
450 | wm8523_add_widgets(codec); | 449 | wm8523_add_widgets(codec); |
451 | ret = snd_soc_init_card(socdev); | ||
452 | if (ret < 0) { | ||
453 | dev_err(codec->dev, "failed to register card: %d\n", ret); | ||
454 | goto card_err; | ||
455 | } | ||
456 | 450 | ||
457 | return ret; | 451 | return ret; |
458 | 452 | ||
459 | card_err: | ||
460 | snd_soc_free_pcms(socdev); | ||
461 | snd_soc_dapm_free(socdev); | ||
462 | pcm_err: | 453 | pcm_err: |
463 | return ret; | 454 | return ret; |
464 | } | 455 | } |
@@ -638,21 +629,6 @@ static __devexit int wm8523_i2c_remove(struct i2c_client *client) | |||
638 | return 0; | 629 | return 0; |
639 | } | 630 | } |
640 | 631 | ||
641 | #ifdef CONFIG_PM | ||
642 | static int wm8523_i2c_suspend(struct i2c_client *i2c, pm_message_t msg) | ||
643 | { | ||
644 | return snd_soc_suspend_device(&i2c->dev); | ||
645 | } | ||
646 | |||
647 | static int wm8523_i2c_resume(struct i2c_client *i2c) | ||
648 | { | ||
649 | return snd_soc_resume_device(&i2c->dev); | ||
650 | } | ||
651 | #else | ||
652 | #define wm8523_i2c_suspend NULL | ||
653 | #define wm8523_i2c_resume NULL | ||
654 | #endif | ||
655 | |||
656 | static const struct i2c_device_id wm8523_i2c_id[] = { | 632 | static const struct i2c_device_id wm8523_i2c_id[] = { |
657 | { "wm8523", 0 }, | 633 | { "wm8523", 0 }, |
658 | { } | 634 | { } |
@@ -666,8 +642,6 @@ static struct i2c_driver wm8523_i2c_driver = { | |||
666 | }, | 642 | }, |
667 | .probe = wm8523_i2c_probe, | 643 | .probe = wm8523_i2c_probe, |
668 | .remove = __devexit_p(wm8523_i2c_remove), | 644 | .remove = __devexit_p(wm8523_i2c_remove), |
669 | .suspend = wm8523_i2c_suspend, | ||
670 | .resume = wm8523_i2c_resume, | ||
671 | .id_table = wm8523_i2c_id, | 645 | .id_table = wm8523_i2c_id, |
672 | }; | 646 | }; |
673 | #endif | 647 | #endif |