aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-11-23 14:47:02 +0800
committerEric Miao <eric.miao@linaro.org>2011-11-23 22:51:59 +0800
commit364e96bde13b329fddc9a18f2c14f8e9f33afa89 (patch)
treeb8170b817c7f8c48ec9ee28f333c8ca6efe01de1
parent18d03f417326c98d47cef69d02be0487ea5fe90d (diff)
downloadlinux-linaro-364e96bde13b329fddc9a18f2c14f8e9f33afa89.tar.gz
SAUCE: remove unnecessary suspend/resume functions from mxc_spdif
BugLink: http://bugs.launchpad.net/bugs/882723 Disabling/re-enabling clocks is not necessary as it's done in *_startup() and *_shutdown() functions, and shall be performed during suspend/resume. This is causing warnings of un-matched clk_enable()/clk_disable() Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--sound/soc/codecs/mxc_spdif.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/sound/soc/codecs/mxc_spdif.c b/sound/soc/codecs/mxc_spdif.c
index 3369e3bdcc2..6c33179de34 100644
--- a/sound/soc/codecs/mxc_spdif.c
+++ b/sound/soc/codecs/mxc_spdif.c
@@ -1084,49 +1084,9 @@ static int mxc_spdif_soc_remove(struct snd_soc_codec *codec)
return 0;
}
-#ifdef CONFIG_PM
-static int mxc_spdif_soc_suspend(struct snd_soc_codec *codec,
- pm_message_t state)
-{
- struct mxc_spdif_priv *spdif_priv = snd_soc_codec_get_drvdata(codec);
- struct mxc_spdif_platform_data *plat_data;
-
- if (codec == NULL)
- return -EINVAL;
-
- plat_data = spdif_priv->plat_data;
- clk_disable(plat_data->spdif_clk);
- clk_disable(plat_data->spdif_core_clk);
-
- return 0;
-}
-
-static int mxc_spdif_soc_resume(struct snd_soc_codec *codec)
-{
- struct mxc_spdif_priv *spdif_priv = snd_soc_codec_get_drvdata(codec);
- struct mxc_spdif_platform_data *plat_data;
-
- if (codec == NULL)
- return -EINVAL;
-
- plat_data = spdif_priv->plat_data;
-
- clk_enable(plat_data->spdif_core_clk);
- clk_enable(plat_data->spdif_clk);
- spdif_softreset();
-
- return 0;
-}
-#else
-#define mxc_spdif_soc_suspend NULL
-#define mxc_spdif_soc_resume NULL
-#endif /* CONFIG_PM */
-
struct snd_soc_codec_driver soc_codec_dev_spdif = {
.probe = mxc_spdif_soc_probe,
.remove = mxc_spdif_soc_remove,
- .suspend = mxc_spdif_soc_suspend,
- .resume = mxc_spdif_soc_resume,
};
static int __devinit mxc_spdif_probe(struct platform_device *pdev)