diff options
| -rw-r--r-- | sound/soc/tegra/tegra_aic326x.c | 6 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_asoc_utils.c | 1 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_max98088.c | 6 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/tegra/tegra_aic326x.c b/sound/soc/tegra/tegra_aic326x.c index 93013c5e99b6..cffcd44570c6 100644 --- a/sound/soc/tegra/tegra_aic326x.c +++ b/sound/soc/tegra/tegra_aic326x.c @@ -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"); diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c index 04e7e3c15cd0..0dbbd3fca3e7 100644 --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c @@ -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; diff --git a/sound/soc/tegra/tegra_max98088.c b/sound/soc/tegra/tegra_max98088.c index 9546af83b39d..7b7ac96da42e 100644 --- a/sound/soc/tegra/tegra_max98088.c +++ b/sound/soc/tegra/tegra_max98088.c @@ -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); diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index e7d58803f7c9..291ba4a631e8 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -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) { |