diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2011-12-08 16:26:59 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-15 12:06:37 +0530 |
| commit | 7e9df77309747d934ebf53891a08eda4238606ae (patch) | |
| tree | 61454a89329e83c5ba51cec298d8773ccc668692 /sound/soc/tegra/tegra30_dam.c | |
| parent | 5ae89ec9080a8114e795f698226e0100b11a09cf (diff) | |
ASoC: Tegra: Fix compiler warnings
Bug 912637
Change-Id: I05e2d3dcb903bf9d011f9b108a8f65f25ee1d3b5
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-on: http://git-master/r/68956
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'sound/soc/tegra/tegra30_dam.c')
| -rw-r--r-- | sound/soc/tegra/tegra30_dam.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/tegra/tegra30_dam.c b/sound/soc/tegra/tegra30_dam.c index fe11f2b5702e..fa3d5de4e42d 100644 --- a/sound/soc/tegra/tegra30_dam.c +++ b/sound/soc/tegra/tegra30_dam.c @@ -113,7 +113,7 @@ void tegra30_dam_disable_clock(int ifc) struct tegra30_dam_context *dam; if (ifc >= TEGRA30_NR_DAM_IFC) - return -EINVAL; + return; dam = dams_cont_info[ifc]; clk_disable(dam->dam_clk); @@ -227,7 +227,6 @@ int tegra30_dam_allocate_controller() int tegra30_dam_allocate_channel(int ifc, int chid) { - int i = 0; struct tegra30_dam_context *dam = NULL; if (ifc >= TEGRA30_NR_DAM_IFC) @@ -245,7 +244,6 @@ int tegra30_dam_allocate_channel(int ifc, int chid) int tegra30_dam_free_channel(int ifc, int chid) { - int i = 0; struct tegra30_dam_context *dam = NULL; if (ifc >= TEGRA30_NR_DAM_IFC) @@ -284,7 +282,7 @@ void tegra30_dam_set_samplerate(int ifc, int chid, int samplerate) struct tegra30_dam_context *dam = dams_cont_info[ifc]; if (ifc >= TEGRA30_NR_DAM_IFC) - return -EINVAL; + return; switch (chid) { case dam_ch_in0: @@ -294,7 +292,7 @@ void tegra30_dam_set_samplerate(int ifc, int chid, int samplerate) break; case dam_ch_in1: if (samplerate != dam->outsamplerate) - return -EINVAL; + return; dam->ch_insamplerate[dam_ch_in1] = samplerate; break; case dam_ch_out: @@ -445,6 +443,8 @@ int tegra30_dam_set_acif(int ifc, int chid, unsigned int audio_channels, value |= TEGRA30_CIF_DIRECTION_RX; reg = TEGRA30_DAM_AUDIOCIF_CH1_CTRL; break; + default: + return -EINVAL; } tegra30_dam_writel(dams_cont_info[ifc], value, reg); @@ -458,7 +458,7 @@ void tegra30_dam_enable(int ifc, int on, int chid) struct tegra30_dam_context *dam = dams_cont_info[ifc]; if (ifc >= TEGRA30_NR_DAM_IFC) - return -EINVAL; + return; if (chid == dam_ch_in0) enreg = TEGRA30_DAM_CH0_CTRL; |