aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-13 12:39:56 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-15 10:01:43 -0400
commitd2058b0cd039aad89b111d83b9c347e9d8f57a84 (patch)
tree6bd622cf1ba7518a2e01cab18302b8bdea8b727c
parented9d040d40942e9c48167f9f37f86fab8e0e5e17 (diff)
ASoC: Remove snd_soc_suspend_device()
The PM core will grow pm_link infrastructure in 2.6.33 which can be used to implement the intended functionality of the ASoC-specific device suspend and resume callbacks so drop them. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat
-rw-r--r--include/sound/soc.h5
-rw-r--r--sound/soc/codecs/cs4270.c20
-rw-r--r--sound/soc/codecs/wm8350.c17
-rw-r--r--sound/soc/codecs/wm8400.c17
-rw-r--r--sound/soc/codecs/wm8523.c17
-rw-r--r--sound/soc/codecs/wm8580.c17
-rw-r--r--sound/soc/codecs/wm8711.c17
-rw-r--r--sound/soc/codecs/wm8731.c34
-rw-r--r--sound/soc/codecs/wm8753.c35
-rw-r--r--sound/soc/codecs/wm8776.c34
-rw-r--r--sound/soc/codecs/wm8900.c17
-rw-r--r--sound/soc/codecs/wm8903.c17
-rw-r--r--sound/soc/codecs/wm8940.c17
-rw-r--r--sound/soc/codecs/wm8960.c17
-rw-r--r--sound/soc/codecs/wm8961.c17
-rw-r--r--sound/soc/codecs/wm8988.c34
-rw-r--r--sound/soc/codecs/wm9081.c17
-rw-r--r--sound/soc/soc-core.c39
18 files changed, 0 insertions, 388 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0b1f917a53ba..b1245e3acdfc 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -223,11 +223,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
223 int addr_bits, int data_bits, 223 int addr_bits, int data_bits,
224 enum snd_soc_control_type control); 224 enum snd_soc_control_type control);
225 225
226#ifdef CONFIG_PM
227int snd_soc_suspend_device(struct device *dev);
228int snd_soc_resume_device(struct device *dev);
229#endif
230
231/* pcm <-> DAI connect */ 226/* pcm <-> DAI connect */
232void snd_soc_free_pcms(struct snd_soc_device *socdev); 227void snd_soc_free_pcms(struct snd_soc_device *socdev);
233int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid); 228int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index ca1e24a8f12a..59bb16d033d6 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -802,22 +802,6 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id);
802 * and all registers are written back to the hardware when resuming. 802 * and all registers are written back to the hardware when resuming.
803 */ 803 */
804 804
805static int cs4270_i2c_suspend(struct i2c_client *client, pm_message_t mesg)
806{
807 struct cs4270_private *cs4270 = i2c_get_clientdata(client);
808 struct snd_soc_codec *codec = &cs4270->codec;
809
810 return snd_soc_suspend_device(codec->dev);
811}
812
813static int cs4270_i2c_resume(struct i2c_client *client)
814{
815 struct cs4270_private *cs4270 = i2c_get_clientdata(client);
816 struct snd_soc_codec *codec = &cs4270->codec;
817
818 return snd_soc_resume_device(codec->dev);
819}
820
821static int cs4270_soc_suspend(struct platform_device *pdev, pm_message_t mesg) 805static int cs4270_soc_suspend(struct platform_device *pdev, pm_message_t mesg)
822{ 806{
823 struct snd_soc_codec *codec = cs4270_codec; 807 struct snd_soc_codec *codec = cs4270_codec;
@@ -853,8 +837,6 @@ static int cs4270_soc_resume(struct platform_device *pdev)
853 return snd_soc_write(codec, CS4270_PWRCTL, reg); 837 return snd_soc_write(codec, CS4270_PWRCTL, reg);
854} 838}
855#else 839#else
856#define cs4270_i2c_suspend NULL
857#define cs4270_i2c_resume NULL
858#define cs4270_soc_suspend NULL 840#define cs4270_soc_suspend NULL
859#define cs4270_soc_resume NULL 841#define cs4270_soc_resume NULL
860#endif /* CONFIG_PM */ 842#endif /* CONFIG_PM */
@@ -873,8 +855,6 @@ static struct i2c_driver cs4270_i2c_driver = {
873 .id_table = cs4270_id, 855 .id_table = cs4270_id,
874 .probe = cs4270_i2c_probe, 856 .probe = cs4270_i2c_probe,
875 .remove = cs4270_i2c_remove, 857 .remove = cs4270_i2c_remove,
876 .suspend = cs4270_i2c_suspend,
877 .resume = cs4270_i2c_resume,
878}; 858};
879 859
880/* 860/*
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 72abc5a6d8d8..714114b50d18 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1680,21 +1680,6 @@ static int __devexit wm8350_codec_remove(struct platform_device *pdev)
1680 return 0; 1680 return 0;
1681} 1681}
1682 1682
1683#ifdef CONFIG_PM
1684static int wm8350_codec_suspend(struct platform_device *pdev, pm_message_t m)
1685{
1686 return snd_soc_suspend_device(&pdev->dev);
1687}
1688
1689static int wm8350_codec_resume(struct platform_device *pdev)
1690{
1691 return snd_soc_resume_device(&pdev->dev);
1692}
1693#else
1694#define wm8350_codec_suspend NULL
1695#define wm8350_codec_resume NULL
1696#endif
1697
1698static struct platform_driver wm8350_codec_driver = { 1683static struct platform_driver wm8350_codec_driver = {
1699 .driver = { 1684 .driver = {
1700 .name = "wm8350-codec", 1685 .name = "wm8350-codec",
@@ -1702,8 +1687,6 @@ static struct platform_driver wm8350_codec_driver = {
1702 }, 1687 },
1703 .probe = wm8350_codec_probe, 1688 .probe = wm8350_codec_probe,
1704 .remove = __devexit_p(wm8350_codec_remove), 1689 .remove = __devexit_p(wm8350_codec_remove),
1705 .suspend = wm8350_codec_suspend,
1706 .resume = wm8350_codec_resume,
1707}; 1690};
1708 1691
1709static __init int wm8350_init(void) 1692static __init int wm8350_init(void)
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 9cb8e50f0fbb..bd7eecba20fe 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1559,21 +1559,6 @@ static int __exit wm8400_codec_remove(struct platform_device *dev)
1559 return 0; 1559 return 0;
1560} 1560}
1561 1561
1562#ifdef CONFIG_PM
1563static int wm8400_pdev_suspend(struct platform_device *pdev, pm_message_t msg)
1564{
1565 return snd_soc_suspend_device(&pdev->dev);
1566}
1567
1568static int wm8400_pdev_resume(struct platform_device *pdev)
1569{
1570 return snd_soc_resume_device(&pdev->dev);
1571}
1572#else
1573#define wm8400_pdev_suspend NULL
1574#define wm8400_pdev_resume NULL
1575#endif
1576
1577static struct platform_driver wm8400_codec_driver = { 1562static struct platform_driver wm8400_codec_driver = {
1578 .driver = { 1563 .driver = {
1579 .name = "wm8400-codec", 1564 .name = "wm8400-codec",
@@ -1581,8 +1566,6 @@ static struct platform_driver wm8400_codec_driver = {
1581 }, 1566 },
1582 .probe = wm8400_codec_probe, 1567 .probe = wm8400_codec_probe,
1583 .remove = __exit_p(wm8400_codec_remove), 1568 .remove = __exit_p(wm8400_codec_remove),
1584 .suspend = wm8400_pdev_suspend,
1585 .resume = wm8400_pdev_resume,
1586}; 1569};
1587 1570
1588static int __init wm8400_codec_init(void) 1571static int __init wm8400_codec_init(void)
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 25870a4652fb..268cab21c2cc 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -638,21 +638,6 @@ static __devexit int wm8523_i2c_remove(struct i2c_client *client)
638 return 0; 638 return 0;
639} 639}
640 640
641#ifdef CONFIG_PM
642static int wm8523_i2c_suspend(struct i2c_client *i2c, pm_message_t msg)
643{
644 return snd_soc_suspend_device(&i2c->dev);
645}
646
647static 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
656static const struct i2c_device_id wm8523_i2c_id[] = { 641static const struct i2c_device_id wm8523_i2c_id[] = {
657 { "wm8523", 0 }, 642 { "wm8523", 0 },
658 { } 643 { }
@@ -666,8 +651,6 @@ static struct i2c_driver wm8523_i2c_driver = {
666 }, 651 },
667 .probe = wm8523_i2c_probe, 652 .probe = wm8523_i2c_probe,
668 .remove = __devexit_p(wm8523_i2c_remove), 653 .remove = __devexit_p(wm8523_i2c_remove),
669 .suspend = wm8523_i2c_suspend,
670 .resume = wm8523_i2c_resume,
671 .id_table = wm8523_i2c_id, 654 .id_table = wm8523_i2c_id,
672}; 655};
673#endif 656#endif
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 3be5c0b2552c..a09b23e03664 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -961,21 +961,6 @@ static int wm8580_i2c_remove(struct i2c_client *client)
961 return 0; 961 return 0;
962} 962}
963 963
964#ifdef CONFIG_PM
965static int wm8580_i2c_suspend(struct i2c_client *client, pm_message_t msg)
966{
967 return snd_soc_suspend_device(&client->dev);
968}
969
970static int wm8580_i2c_resume(struct i2c_client *client)
971{
972 return snd_soc_resume_device(&client->dev);
973}
974#else
975#define wm8580_i2c_suspend NULL
976#define wm8580_i2c_resume NULL
977#endif
978
979static const struct i2c_device_id wm8580_i2c_id[] = { 964static const struct i2c_device_id wm8580_i2c_id[] = {
980 { "wm8580", 0 }, 965 { "wm8580", 0 },
981 { } 966 { }
@@ -989,8 +974,6 @@ static struct i2c_driver wm8580_i2c_driver = {
989 }, 974 },
990 .probe = wm8580_i2c_probe, 975 .probe = wm8580_i2c_probe,
991 .remove = wm8580_i2c_remove, 976 .remove = wm8580_i2c_remove,
992 .suspend = wm8580_i2c_suspend,
993 .resume = wm8580_i2c_resume,
994 .id_table = wm8580_i2c_id, 977 .id_table = wm8580_i2c_id,
995}; 978};
996#endif 979#endif
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 90ec8c58e2f4..54189fbf9e93 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -548,21 +548,6 @@ static int __devexit wm8711_spi_remove(struct spi_device *spi)
548 return 0; 548 return 0;
549} 549}
550 550
551#ifdef CONFIG_PM
552static int wm8711_spi_suspend(struct spi_device *spi, pm_message_t msg)
553{
554 return snd_soc_suspend_device(&spi->dev);
555}
556
557static int wm8711_spi_resume(struct spi_device *spi)
558{
559 return snd_soc_resume_device(&spi->dev);
560}
561#else
562#define wm8711_spi_suspend NULL
563#define wm8711_spi_resume NULL
564#endif
565
566static struct spi_driver wm8711_spi_driver = { 551static struct spi_driver wm8711_spi_driver = {
567 .driver = { 552 .driver = {
568 .name = "wm8711", 553 .name = "wm8711",
@@ -570,8 +555,6 @@ static struct spi_driver wm8711_spi_driver = {
570 .owner = THIS_MODULE, 555 .owner = THIS_MODULE,
571 }, 556 },
572 .probe = wm8711_spi_probe, 557 .probe = wm8711_spi_probe,
573 .suspend = wm8711_spi_suspend,
574 .resume = wm8711_spi_resume,
575 .remove = __devexit_p(wm8711_spi_remove), 558 .remove = __devexit_p(wm8711_spi_remove),
576}; 559};
577#endif /* CONFIG_SPI_MASTER */ 560#endif /* CONFIG_SPI_MASTER */
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index d3fd4f28d96e..0e59219a59f4 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -623,21 +623,6 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi)
623 return 0; 623 return 0;
624} 624}
625 625
626#ifdef CONFIG_PM
627static int wm8731_spi_suspend(struct spi_device *spi, pm_message_t msg)
628{
629 return snd_soc_suspend_device(&spi->dev);
630}
631
632static int wm8731_spi_resume(struct spi_device *spi)
633{
634 return snd_soc_resume_device(&spi->dev);
635}
636#else
637#define wm8731_spi_suspend NULL
638#define wm8731_spi_resume NULL
639#endif
640
641static struct spi_driver wm8731_spi_driver = { 626static struct spi_driver wm8731_spi_driver = {
642 .driver = { 627 .driver = {
643 .name = "wm8731", 628 .name = "wm8731",
@@ -645,8 +630,6 @@ static struct spi_driver wm8731_spi_driver = {
645 .owner = THIS_MODULE, 630 .owner = THIS_MODULE,
646 }, 631 },
647 .probe = wm8731_spi_probe, 632 .probe = wm8731_spi_probe,
648 .suspend = wm8731_spi_suspend,
649 .resume = wm8731_spi_resume,
650 .remove = __devexit_p(wm8731_spi_remove), 633 .remove = __devexit_p(wm8731_spi_remove),
651}; 634};
652#endif /* CONFIG_SPI_MASTER */ 635#endif /* CONFIG_SPI_MASTER */
@@ -679,21 +662,6 @@ static __devexit int wm8731_i2c_remove(struct i2c_client *client)
679 return 0; 662 return 0;
680} 663}
681 664
682#ifdef CONFIG_PM
683static int wm8731_i2c_suspend(struct i2c_client *i2c, pm_message_t msg)
684{
685 return snd_soc_suspend_device(&i2c->dev);
686}
687
688static int wm8731_i2c_resume(struct i2c_client *i2c)
689{
690 return snd_soc_resume_device(&i2c->dev);
691}
692#else
693#define wm8731_i2c_suspend NULL
694#define wm8731_i2c_resume NULL
695#endif
696
697static const struct i2c_device_id wm8731_i2c_id[] = { 665static const struct i2c_device_id wm8731_i2c_id[] = {
698 { "wm8731", 0 }, 666 { "wm8731", 0 },
699 { } 667 { }
@@ -707,8 +675,6 @@ static struct i2c_driver wm8731_i2c_driver = {
707 }, 675 },
708 .probe = wm8731_i2c_probe, 676 .probe = wm8731_i2c_probe,
709 .remove = __devexit_p(wm8731_i2c_remove), 677 .remove = __devexit_p(wm8731_i2c_remove),
710 .suspend = wm8731_i2c_suspend,
711 .resume = wm8731_i2c_resume,
712 .id_table = wm8731_i2c_id, 678 .id_table = wm8731_i2c_id,
713}; 679};
714#endif 680#endif
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 9b27efb052fe..8f7305257d29 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1767,21 +1767,6 @@ static int wm8753_i2c_remove(struct i2c_client *client)
1767 return 0; 1767 return 0;
1768} 1768}
1769 1769
1770#ifdef CONFIG_PM
1771static int wm8753_i2c_suspend(struct i2c_client *client, pm_message_t msg)
1772{
1773 return snd_soc_suspend_device(&client->dev);
1774}
1775
1776static int wm8753_i2c_resume(struct i2c_client *client)
1777{
1778 return snd_soc_resume_device(&client->dev);
1779}
1780#else
1781#define wm8753_i2c_suspend NULL
1782#define wm8753_i2c_resume NULL
1783#endif
1784
1785static const struct i2c_device_id wm8753_i2c_id[] = { 1770static const struct i2c_device_id wm8753_i2c_id[] = {
1786 { "wm8753", 0 }, 1771 { "wm8753", 0 },
1787 { } 1772 { }
@@ -1795,8 +1780,6 @@ static struct i2c_driver wm8753_i2c_driver = {
1795 }, 1780 },
1796 .probe = wm8753_i2c_probe, 1781 .probe = wm8753_i2c_probe,
1797 .remove = wm8753_i2c_remove, 1782 .remove = wm8753_i2c_remove,
1798 .suspend = wm8753_i2c_suspend,
1799 .resume = wm8753_i2c_resume,
1800 .id_table = wm8753_i2c_id, 1783 .id_table = wm8753_i2c_id,
1801}; 1784};
1802#endif 1785#endif
@@ -1852,22 +1835,6 @@ static int __devexit wm8753_spi_remove(struct spi_device *spi)
1852 return 0; 1835 return 0;
1853} 1836}
1854 1837
1855#ifdef CONFIG_PM
1856static int wm8753_spi_suspend(struct spi_device *spi, pm_message_t msg)
1857{
1858 return snd_soc_suspend_device(&spi->dev);
1859}
1860
1861static int wm8753_spi_resume(struct spi_device *spi)
1862{
1863 return snd_soc_resume_device(&spi->dev);
1864}
1865
1866#else
1867#define wm8753_spi_suspend NULL
1868#define wm8753_spi_resume NULL
1869#endif
1870
1871static struct spi_driver wm8753_spi_driver = { 1838static struct spi_driver wm8753_spi_driver = {
1872 .driver = { 1839 .driver = {
1873 .name = "wm8753", 1840 .name = "wm8753",
@@ -1876,8 +1843,6 @@ static struct spi_driver wm8753_spi_driver = {
1876 }, 1843 },
1877 .probe = wm8753_spi_probe, 1844 .probe = wm8753_spi_probe,
1878 .remove = __devexit_p(wm8753_spi_remove), 1845 .remove = __devexit_p(wm8753_spi_remove),
1879 .suspend = wm8753_spi_suspend,
1880 .resume = wm8753_spi_resume,
1881}; 1846};
1882#endif 1847#endif
1883 1848
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index a9829aa26e53..a0bbb28eed75 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -616,21 +616,6 @@ static int __devexit wm8776_spi_remove(struct spi_device *spi)
616 return 0; 616 return 0;
617} 617}
618 618
619#ifdef CONFIG_PM
620static int wm8776_spi_suspend(struct spi_device *spi, pm_message_t msg)
621{
622 return snd_soc_suspend_device(&spi->dev);
623}
624
625static int wm8776_spi_resume(struct spi_device *spi)
626{
627 return snd_soc_resume_device(&spi->dev);
628}
629#else
630#define wm8776_spi_suspend NULL
631#define wm8776_spi_resume NULL
632#endif
633
634static struct spi_driver wm8776_spi_driver = { 619static struct spi_driver wm8776_spi_driver = {
635 .driver = { 620 .driver = {
636 .name = "wm8776", 621 .name = "wm8776",
@@ -638,8 +623,6 @@ static struct spi_driver wm8776_spi_driver = {
638 .owner = THIS_MODULE, 623 .owner = THIS_MODULE,
639 }, 624 },
640 .probe = wm8776_spi_probe, 625 .probe = wm8776_spi_probe,
641 .suspend = wm8776_spi_suspend,
642 .resume = wm8776_spi_resume,
643 .remove = __devexit_p(wm8776_spi_remove), 626 .remove = __devexit_p(wm8776_spi_remove),
644}; 627};
645#endif /* CONFIG_SPI_MASTER */ 628#endif /* CONFIG_SPI_MASTER */
@@ -673,21 +656,6 @@ static __devexit int wm8776_i2c_remove(struct i2c_client *client)
673 return 0; 656 return 0;
674} 657}
675 658
676#ifdef CONFIG_PM
677static int wm8776_i2c_suspend(struct i2c_client *i2c, pm_message_t msg)
678{
679 return snd_soc_suspend_device(&i2c->dev);
680}
681
682static int wm8776_i2c_resume(struct i2c_client *i2c)
683{
684 return snd_soc_resume_device(&i2c->dev);
685}
686#else
687#define wm8776_i2c_suspend NULL
688#define wm8776_i2c_resume NULL
689#endif
690
691static const struct i2c_device_id wm8776_i2c_id[] = { 659static const struct i2c_device_id wm8776_i2c_id[] = {
692 { "wm8776", 0 }, 660 { "wm8776", 0 },
693 { } 661 { }
@@ -701,8 +669,6 @@ static struct i2c_driver wm8776_i2c_driver = {
701 }, 669 },
702 .probe = wm8776_i2c_probe, 670 .probe = wm8776_i2c_probe,
703 .remove = __devexit_p(wm8776_i2c_remove), 671 .remove = __devexit_p(wm8776_i2c_remove),
704 .suspend = wm8776_i2c_suspend,
705 .resume = wm8776_i2c_resume,
706 .id_table = wm8776_i2c_id, 672 .id_table = wm8776_i2c_id,
707}; 673};
708#endif 674#endif
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 882604ef768c..b48804b5cacd 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1312,21 +1312,6 @@ static __devexit int wm8900_i2c_remove(struct i2c_client *client)
1312 return 0; 1312 return 0;
1313} 1313}
1314 1314
1315#ifdef CONFIG_PM
1316static int wm8900_i2c_suspend(struct i2c_client *client, pm_message_t msg)
1317{
1318 return snd_soc_suspend_device(&client->dev);
1319}
1320
1321static int wm8900_i2c_resume(struct i2c_client *client)
1322{
1323 return snd_soc_resume_device(&client->dev);
1324}
1325#else
1326#define wm8900_i2c_suspend NULL
1327#define wm8900_i2c_resume NULL
1328#endif
1329
1330static const struct i2c_device_id wm8900_i2c_id[] = { 1315static const struct i2c_device_id wm8900_i2c_id[] = {
1331 { "wm8900", 0 }, 1316 { "wm8900", 0 },
1332 { } 1317 { }
@@ -1340,8 +1325,6 @@ static struct i2c_driver wm8900_i2c_driver = {
1340 }, 1325 },
1341 .probe = wm8900_i2c_probe, 1326 .probe = wm8900_i2c_probe,
1342 .remove = __devexit_p(wm8900_i2c_remove), 1327 .remove = __devexit_p(wm8900_i2c_remove),
1343 .suspend = wm8900_i2c_suspend,
1344 .resume = wm8900_i2c_resume,
1345 .id_table = wm8900_i2c_id, 1328 .id_table = wm8900_i2c_id,
1346}; 1329};
1347 1330
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index fe1307b500cf..94cdb8130415 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1655,21 +1655,6 @@ static __devexit int wm8903_i2c_remove(struct i2c_client *client)
1655 return 0; 1655 return 0;
1656} 1656}
1657 1657
1658#ifdef CONFIG_PM
1659static int wm8903_i2c_suspend(struct i2c_client *client, pm_message_t msg)
1660{
1661 return snd_soc_suspend_device(&client->dev);
1662}
1663
1664static int wm8903_i2c_resume(struct i2c_client *client)
1665{
1666 return snd_soc_resume_device(&client->dev);
1667}
1668#else
1669#define wm8903_i2c_suspend NULL
1670#define wm8903_i2c_resume NULL
1671#endif
1672
1673/* i2c codec control layer */ 1658/* i2c codec control layer */
1674static const struct i2c_device_id wm8903_i2c_id[] = { 1659static const struct i2c_device_id wm8903_i2c_id[] = {
1675 { "wm8903", 0 }, 1660 { "wm8903", 0 },
@@ -1684,8 +1669,6 @@ static struct i2c_driver wm8903_i2c_driver = {
1684 }, 1669 },
1685 .probe = wm8903_i2c_probe, 1670 .probe = wm8903_i2c_probe,
1686 .remove = __devexit_p(wm8903_i2c_remove), 1671 .remove = __devexit_p(wm8903_i2c_remove),
1687 .suspend = wm8903_i2c_suspend,
1688 .resume = wm8903_i2c_resume,
1689 .id_table = wm8903_i2c_id, 1672 .id_table = wm8903_i2c_id,
1690}; 1673};
1691 1674
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 1685cfb993c6..8d4fd3c08c09 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -877,21 +877,6 @@ static int __devexit wm8940_i2c_remove(struct i2c_client *client)
877 return 0; 877 return 0;
878} 878}
879 879
880#ifdef CONFIG_PM
881static int wm8940_i2c_suspend(struct i2c_client *client, pm_message_t msg)
882{
883 return snd_soc_suspend_device(&client->dev);
884}
885
886static int wm8940_i2c_resume(struct i2c_client *client)
887{
888 return snd_soc_resume_device(&client->dev);
889}
890#else
891#define wm8940_i2c_suspend NULL
892#define wm8940_i2c_resume NULL
893#endif
894
895static const struct i2c_device_id wm8940_i2c_id[] = { 880static const struct i2c_device_id wm8940_i2c_id[] = {
896 { "wm8940", 0 }, 881 { "wm8940", 0 },
897 { } 882 { }
@@ -905,8 +890,6 @@ static struct i2c_driver wm8940_i2c_driver = {
905 }, 890 },
906 .probe = wm8940_i2c_probe, 891 .probe = wm8940_i2c_probe,
907 .remove = __devexit_p(wm8940_i2c_remove), 892 .remove = __devexit_p(wm8940_i2c_remove),
908 .suspend = wm8940_i2c_suspend,
909 .resume = wm8940_i2c_resume,
910 .id_table = wm8940_i2c_id, 893 .id_table = wm8940_i2c_id,
911}; 894};
912 895
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 416fb3c17018..b9b096a85396 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -883,21 +883,6 @@ static __devexit int wm8960_i2c_remove(struct i2c_client *client)
883 return 0; 883 return 0;
884} 884}
885 885
886#ifdef CONFIG_PM
887static int wm8960_i2c_suspend(struct i2c_client *client, pm_message_t msg)
888{
889 return snd_soc_suspend_device(&client->dev);
890}
891
892static int wm8960_i2c_resume(struct i2c_client *client)
893{
894 return snd_soc_resume_device(&client->dev);
895}
896#else
897#define wm8960_i2c_suspend NULL
898#define wm8960_i2c_resume NULL
899#endif
900
901static const struct i2c_device_id wm8960_i2c_id[] = { 886static const struct i2c_device_id wm8960_i2c_id[] = {
902 { "wm8960", 0 }, 887 { "wm8960", 0 },
903 { } 888 { }
@@ -911,8 +896,6 @@ static struct i2c_driver wm8960_i2c_driver = {
911 }, 896 },
912 .probe = wm8960_i2c_probe, 897 .probe = wm8960_i2c_probe,
913 .remove = __devexit_p(wm8960_i2c_remove), 898 .remove = __devexit_p(wm8960_i2c_remove),
914 .suspend = wm8960_i2c_suspend,
915 .resume = wm8960_i2c_resume,
916 .id_table = wm8960_i2c_id, 899 .id_table = wm8960_i2c_id,
917}; 900};
918 901
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 503032085899..b5c6f2cd5ae2 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -1206,21 +1206,6 @@ static __devexit int wm8961_i2c_remove(struct i2c_client *client)
1206 return 0; 1206 return 0;
1207} 1207}
1208 1208
1209#ifdef CONFIG_PM
1210static int wm8961_i2c_suspend(struct i2c_client *client, pm_message_t state)
1211{
1212 return snd_soc_suspend_device(&client->dev);
1213}
1214
1215static int wm8961_i2c_resume(struct i2c_client *client)
1216{
1217 return snd_soc_resume_device(&client->dev);
1218}
1219#else
1220#define wm8961_i2c_suspend NULL
1221#define wm8961_i2c_resume NULL
1222#endif
1223
1224static const struct i2c_device_id wm8961_i2c_id[] = { 1209static const struct i2c_device_id wm8961_i2c_id[] = {
1225 { "wm8961", 0 }, 1210 { "wm8961", 0 },
1226 { } 1211 { }
@@ -1234,8 +1219,6 @@ static struct i2c_driver wm8961_i2c_driver = {
1234 }, 1219 },
1235 .probe = wm8961_i2c_probe, 1220 .probe = wm8961_i2c_probe,
1236 .remove = __devexit_p(wm8961_i2c_remove), 1221 .remove = __devexit_p(wm8961_i2c_remove),
1237 .suspend = wm8961_i2c_suspend,
1238 .resume = wm8961_i2c_resume,
1239 .id_table = wm8961_i2c_id, 1222 .id_table = wm8961_i2c_id,
1240}; 1223};
1241 1224
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 3f530f8a972a..d8d8f68b81ea 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -944,21 +944,6 @@ static int wm8988_i2c_remove(struct i2c_client *client)
944 return 0; 944 return 0;
945} 945}
946 946
947#ifdef CONFIG_PM
948static int wm8988_i2c_suspend(struct i2c_client *client, pm_message_t msg)
949{
950 return snd_soc_suspend_device(&client->dev);
951}
952
953static int wm8988_i2c_resume(struct i2c_client *client)
954{
955 return snd_soc_resume_device(&client->dev);
956}
957#else
958#define wm8988_i2c_suspend NULL
959#define wm8988_i2c_resume NULL
960#endif
961
962static const struct i2c_device_id wm8988_i2c_id[] = { 947static const struct i2c_device_id wm8988_i2c_id[] = {
963 { "wm8988", 0 }, 948 { "wm8988", 0 },
964 { } 949 { }
@@ -972,8 +957,6 @@ static struct i2c_driver wm8988_i2c_driver = {
972 }, 957 },
973 .probe = wm8988_i2c_probe, 958 .probe = wm8988_i2c_probe,
974 .remove = wm8988_i2c_remove, 959 .remove = wm8988_i2c_remove,
975 .suspend = wm8988_i2c_suspend,
976 .resume = wm8988_i2c_resume,
977 .id_table = wm8988_i2c_id, 960 .id_table = wm8988_i2c_id,
978}; 961};
979#endif 962#endif
@@ -1006,21 +989,6 @@ static int __devexit wm8988_spi_remove(struct spi_device *spi)
1006 return 0; 989 return 0;
1007} 990}
1008 991
1009#ifdef CONFIG_PM
1010static int wm8988_spi_suspend(struct spi_device *spi, pm_message_t msg)
1011{
1012 return snd_soc_suspend_device(&spi->dev);
1013}
1014
1015static int wm8988_spi_resume(struct spi_device *spi)
1016{
1017 return snd_soc_resume_device(&spi->dev);
1018}
1019#else
1020#define wm8988_spi_suspend NULL
1021#define wm8988_spi_resume NULL
1022#endif
1023
1024static struct spi_driver wm8988_spi_driver = { 992static struct spi_driver wm8988_spi_driver = {
1025 .driver = { 993 .driver = {
1026 .name = "wm8988", 994 .name = "wm8988",
@@ -1029,8 +997,6 @@ static struct spi_driver wm8988_spi_driver = {
1029 }, 997 },
1030 .probe = wm8988_spi_probe, 998 .probe = wm8988_spi_probe,
1031 .remove = __devexit_p(wm8988_spi_remove), 999 .remove = __devexit_p(wm8988_spi_remove),
1032 .suspend = wm8988_spi_suspend,
1033 .resume = wm8988_spi_resume,
1034}; 1000};
1035#endif 1001#endif
1036 1002
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 686e5aa97206..4cb6b104b729 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1452,21 +1452,6 @@ static __devexit int wm9081_i2c_remove(struct i2c_client *client)
1452 return 0; 1452 return 0;
1453} 1453}
1454 1454
1455#ifdef CONFIG_PM
1456static int wm9081_i2c_suspend(struct i2c_client *client, pm_message_t msg)
1457{
1458 return snd_soc_suspend_device(&client->dev);
1459}
1460
1461static int wm9081_i2c_resume(struct i2c_client *client)
1462{
1463 return snd_soc_resume_device(&client->dev);
1464}
1465#else
1466#define wm9081_i2c_suspend NULL
1467#define wm9081_i2c_resume NULL
1468#endif
1469
1470static const struct i2c_device_id wm9081_i2c_id[] = { 1455static const struct i2c_device_id wm9081_i2c_id[] = {
1471 { "wm9081", 0 }, 1456 { "wm9081", 0 },
1472 { } 1457 { }
@@ -1480,8 +1465,6 @@ static struct i2c_driver wm9081_i2c_driver = {
1480 }, 1465 },
1481 .probe = wm9081_i2c_probe, 1466 .probe = wm9081_i2c_probe,
1482 .remove = __devexit_p(wm9081_i2c_remove), 1467 .remove = __devexit_p(wm9081_i2c_remove),
1483 .suspend = wm9081_i2c_suspend,
1484 .resume = wm9081_i2c_resume,
1485 .id_table = wm9081_i2c_id, 1468 .id_table = wm9081_i2c_id,
1486}; 1469};
1487 1470
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1dec9d21c55e..fa0da3cac705 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -790,45 +790,6 @@ static int soc_resume(struct device *dev)
790 790
791 return 0; 791 return 0;
792} 792}
793
794/**
795 * snd_soc_suspend_device: Notify core of device suspend
796 *
797 * @dev: Device being suspended.
798 *
799 * In order to ensure that the entire audio subsystem is suspended in a
800 * coordinated fashion ASoC devices should suspend themselves when
801 * called by ASoC. When the standard kernel suspend process asks the
802 * device to suspend it should call this function to initiate a suspend
803 * of the entire ASoC card.
804 *
805 * \note Currently this function is stubbed out.
806 */
807int snd_soc_suspend_device(struct device *dev)
808{
809 return 0;
810}
811EXPORT_SYMBOL_GPL(snd_soc_suspend_device);
812
813/**
814 * snd_soc_resume_device: Notify core of device resume
815 *
816 * @dev: Device being resumed.
817 *
818 * In order to ensure that the entire audio subsystem is resumed in a
819 * coordinated fashion ASoC devices should resume themselves when called
820 * by ASoC. When the standard kernel resume process asks the device
821 * to resume it should call this function. Once all the components of
822 * the card have notified that they are ready to be resumed the card
823 * will be resumed.
824 *
825 * \note Currently this function is stubbed out.
826 */
827int snd_soc_resume_device(struct device *dev)
828{
829 return 0;
830}
831EXPORT_SYMBOL_GPL(snd_soc_resume_device);
832#else 793#else
833#define soc_suspend NULL 794#define soc_suspend NULL
834#define soc_resume NULL 795#define soc_resume NULL
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-08 01:29:45 -0400