evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: omap-mcbsp: Fix compilation error due to leftover code

Browse source 
Part of commit (which patches sound/soc/omap/mcbsp.c file):
8fef626 ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code

since the tree where it has been applied did not had the earlier patch:
d0db84e ASoC: omap-mcbsp: Fix 6pin mux configuration
which changed code around omap_mcbsp_6pin_src_mux().

Because of the missing part from 8fef626 the sound/soc/omap/mcbsp.c does
not compile in linux-next.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2012-08-30 17:06:15 +03:00 • committed by Mark Brown
parent fc600432cd
commit e93c7d1bc3
1 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sound/soc/omap/mcbsp.c
View file

@ -762,37 +762,6 @@ int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
} }
int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
{
const char *signal, *src;
if (!mcbsp->pdata->mux_signal)
return -EINVAL;
switch (mux) {
case CLKR_SRC_CLKR:
signal = "clkr";
src = "clkr";
break;
case CLKR_SRC_CLKX:
signal = "clkr";
src = "clkx";
break;
case FSR_SRC_FSR:
signal = "fsr";
src = "fsr";
break;
case FSR_SRC_FSX:
signal = "fsr";
src = "fsx";
break;
default:
return -EINVAL;
}
return mcbsp->pdata->mux_signal(mcbsp->dev, signal, src);
}
#define max_thres(m) (mcbsp->pdata->buffer_size) #define max_thres(m) (mcbsp->pdata->buffer_size)
#define valid_threshold(m, val) ((val) <= max_thres(m)) #define valid_threshold(m, val) ((val) <= max_thres(m))
#define THRESHOLD_PROP_BUILDER(prop) \ #define THRESHOLD_PROP_BUILDER(prop) \