aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2012-12-05 12:20:36 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-07 00:46:56 -0500
commitd0c6c482f6d8c2145717ab0266c87e3e792527ef (patch)
tree7cef78aa68935a41eb7bd8fea3aecb51fa1e7b1b
parent88abfd5b84cc98c839fb7783c59b4c79d63d45e2 (diff)
ASoC: McASP: remove unused variables
codec_fmt and sample_rate variables are unused in both snd_platform_data and davinci_audio_dev, so drop them. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/linux/platform_data/davinci_asp.h1
-rw-r--r--sound/soc/davinci/davinci-mcasp.c1
-rw-r--r--sound/soc/davinci/davinci-mcasp.h2
3 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index f3d6e4f20962..8db5ae03b6e3 100644
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -23,7 +23,6 @@ struct snd_platform_data {
23 u32 rx_dma_offset; 23 u32 rx_dma_offset;
24 int asp_chan_q; /* event queue number for ASP channel */ 24 int asp_chan_q; /* event queue number for ASP channel */
25 int ram_chan_q; /* event queue number for RAM channel */ 25 int ram_chan_q; /* event queue number for RAM channel */
26 unsigned int codec_fmt;
27 /* 26 /*
28 * Allowing this is more efficient and eliminates left and right swaps 27 * Allowing this is more efficient and eliminates left and right swaps
29 * caused by underruns, but will swap the left and right channels 28 * caused by underruns, but will swap the left and right channels
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 571559501b0b..7c248371f7ec 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1158,7 +1158,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
1158 dev->tdm_slots = pdata->tdm_slots; 1158 dev->tdm_slots = pdata->tdm_slots;
1159 dev->num_serializer = pdata->num_serializer; 1159 dev->num_serializer = pdata->num_serializer;
1160 dev->serial_dir = pdata->serial_dir; 1160 dev->serial_dir = pdata->serial_dir;
1161 dev->codec_fmt = pdata->codec_fmt;
1162 dev->version = pdata->version; 1161 dev->version = pdata->version;
1163 dev->txnumevt = pdata->txnumevt; 1162 dev->txnumevt = pdata->txnumevt;
1164 dev->rxnumevt = pdata->rxnumevt; 1163 dev->rxnumevt = pdata->rxnumevt;
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 156f15f55744..a42b5d96739f 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -40,9 +40,7 @@ enum {
40struct davinci_audio_dev { 40struct davinci_audio_dev {
41 struct davinci_pcm_dma_params dma_params[2]; 41 struct davinci_pcm_dma_params dma_params[2];
42 void __iomem *base; 42 void __iomem *base;
43 int sample_rate;
44 struct device *dev; 43 struct device *dev;
45 unsigned int codec_fmt;
46 44
47 /* McASP specific data */ 45 /* McASP specific data */
48 int tdm_slots; 46 int tdm_slots;