diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-13 12:39:56 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-15 10:01:43 -0400 |
commit | d2058b0cd039aad89b111d83b9c347e9d8f57a84 (patch) | |
tree | 6bd622cf1ba7518a2e01cab18302b8bdea8b727c /sound/soc/codecs/wm8753.c | |
parent | ed9d040d40942e9c48167f9f37f86fab8e0e5e17 (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 (limited to 'sound/soc/codecs/wm8753.c')
-rw-r--r-- | sound/soc/codecs/wm8753.c | 35 |
1 files changed, 0 insertions, 35 deletions
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 | ||
1771 | static int wm8753_i2c_suspend(struct i2c_client *client, pm_message_t msg) | ||
1772 | { | ||
1773 | return snd_soc_suspend_device(&client->dev); | ||
1774 | } | ||
1775 | |||
1776 | static 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 | |||
1785 | static const struct i2c_device_id wm8753_i2c_id[] = { | 1770 | static 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 | ||
1856 | static int wm8753_spi_suspend(struct spi_device *spi, pm_message_t msg) | ||
1857 | { | ||
1858 | return snd_soc_suspend_device(&spi->dev); | ||
1859 | } | ||
1860 | |||
1861 | static 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 | |||
1871 | static struct spi_driver wm8753_spi_driver = { | 1838 | static 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 | ||