summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorSanjay Singh Rawat <srawat@nvidia.com>2012-03-28 19:13:20 +0530
committerSimone Willett <swillett@nvidia.com>2012-03-30 18:55:52 -0700
commite7a1cfef77b4517de379cfe4ac9e7e7773e9fb86 (patch)
treec1dd16a8e75b7f96abd5e618b967abf4baf8d5b9 /sound
parentd5197d4955e72310f82185c611da4d42822bee3a (diff)
ASoC: wm8903: resolve compilation time warnings
bug 949219 Change-Id: I8abd1e837a774d15aef25ec8c40b857b8cba0426 Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/92858 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/tegra_wm8903.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 5ccf73223d6d..55e4f61edfd2 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -690,6 +690,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
return 0;
}
+#ifdef WM8903_SET_BIAS_LEVEL
static int tegra30_soc_set_bias_level(struct snd_soc_card *card,
enum snd_soc_bias_level level)
{
@@ -715,6 +716,7 @@ static int tegra30_soc_set_bias_level_post(struct snd_soc_card *card,
return 0 ;
}
+#endif
static struct snd_soc_dai_link tegra_wm8903_dai[] = {
{
@@ -747,15 +749,17 @@ static struct snd_soc_dai_link tegra_wm8903_dai[] = {
},
};
-void tegra_wm8903_suspend_post(struct snd_soc_card *card)
+static int tegra_wm8903_suspend_post(struct snd_soc_card *card)
{
struct snd_soc_jack_gpio *gpio = &tegra_wm8903_hp_jack_gpio;
if (gpio_is_valid(gpio->gpio))
disable_irq(gpio_to_irq(gpio->gpio));
+
+ return 0;
}
-void tegra_wm8903_resume_pre(struct snd_soc_card *card)
+static int tegra_wm8903_resume_pre(struct snd_soc_card *card)
{
int val;
struct snd_soc_jack_gpio *gpio = &tegra_wm8903_hp_jack_gpio;
@@ -766,6 +770,8 @@ void tegra_wm8903_resume_pre(struct snd_soc_card *card)
snd_soc_jack_report(gpio->jack, val, gpio->report);
enable_irq(gpio_to_irq(gpio->gpio));
}
+
+ return 0;
}
static struct snd_soc_card snd_soc_tegra_wm8903 = {