ASoC: resolve compilation time warnings
Sanjay Singh Rawat [Mon, 16 Apr 2012 09:13:57 +0000 (14:13 +0530)]
bug 949219

Change-Id: I52969e8dd1a5ed4dc76ac360ec08b0afb18cd4a5
Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com>
Reviewed-on: http://git-master/r/92833
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

sound/soc/tegra/tegra_aic326x.c
sound/soc/tegra/tegra_asoc_utils.c
sound/soc/tegra/tegra_max98088.c
sound/soc/tegra/tegra_rt5640.c

index 93013c5..cffcd44 100644 (file)
@@ -1142,8 +1142,10 @@ static __devinit int tegra_aic326x_driver_probe(struct platform_device *pdev)
        struct snd_soc_card *card = &snd_soc_tegra_aic326x;
        struct tegra_aic326x *machine;
        struct tegra_asoc_platform_data *pdata;
-       int ret, i;
-
+       int ret;
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
+       int i;
+#endif
        pdata = pdev->dev.platform_data;
        if (!pdata) {
                dev_err(&pdev->dev, "No platform data supplied\n");
index 04e7e3c..0dbbd3f 100644 (file)
@@ -156,7 +156,6 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
                          struct device *dev)
 {
        int ret;
-       int rate;
 
        data->dev = dev;
 
index 9546af8..7b7ac96 100644 (file)
@@ -559,7 +559,7 @@ static void tegra_max98088_shutdown(struct snd_pcm_substream *substream)
         } else {
 
                if (!i2s->is_call_mode_rec)
-                       return 0;
+                       return;
 
                i2s->is_call_mode_rec = 0;
 
@@ -1065,7 +1065,7 @@ static struct snd_soc_dai_link tegra_max98088_dai[NUM_DAI_LINKS] = {
 };
 
 static int tegra30_soc_set_bias_level(struct snd_soc_card *card,
-                                       enum snd_soc_bias_level level)
+       struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level)
 {
        struct tegra_max98088 *machine = snd_soc_card_get_drvdata(card);
 
@@ -1077,7 +1077,7 @@ static int tegra30_soc_set_bias_level(struct snd_soc_card *card,
 }
 
 static int tegra30_soc_set_bias_level_post(struct snd_soc_card *card,
-                                       enum snd_soc_bias_level level)
+       struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level)
 {
        struct tegra_max98088 *machine = snd_soc_card_get_drvdata(card);
 
index e7d5880..291ba4a 100644 (file)
@@ -279,7 +279,7 @@ static int tegra_rt5640_jack_notifier(struct notifier_block *self,
        struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);
        struct tegra_rt5640_platform_data *pdata = machine->pdata;
        enum headset_state state = BIT_NO_HEADSET;
-       unsigned char status_jack;
+       unsigned char status_jack = 0;
 
        if (jack == &tegra_rt5640_hp_jack) {
                if (action) {