aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-03-30 19:07:21 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-01 06:28:31 -0400
commit7deb2b450df9975ab05deb885e386d59a16213a9 (patch)
tree72193e22fe4da59ae9a35396a086c87100d5d618 /sound/soc/tegra
parent4df8271e1ffcc4302a3c5326de15eb6737697001 (diff)
ASoC: tegra: fix some checkpatch warnings
ERROR: trailing whitespace ERROR: code indent should use tabs where possible WARNING: please, no spaces at the start of a line ERROR: "foo * bar" should be "foo *bar" Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra_das.h2
-rw-r--r--sound/soc/tegra/tegra_i2s.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_das.h b/sound/soc/tegra/tegra_das.h
index 2c96c7b3c459..1810cd1e7f0c 100644
--- a/sound/soc/tegra/tegra_das.h
+++ b/sound/soc/tegra/tegra_das.h
@@ -94,7 +94,7 @@ struct tegra_das {
94 * DAS: Digital audio switch (HW module controlled by this driver) 94 * DAS: Digital audio switch (HW module controlled by this driver)
95 * DAP: Digital audio port (port/pins on Tegra device) 95 * DAP: Digital audio port (port/pins on Tegra device)
96 * DAC: Digital audio controller (e.g. I2S or AC97 controller elsewhere) 96 * DAC: Digital audio controller (e.g. I2S or AC97 controller elsewhere)
97 * 97 *
98 * The Tegra DAS is a mux/cross-bar which can connect each DAP to a specific 98 * The Tegra DAS is a mux/cross-bar which can connect each DAP to a specific
99 * DAC, or another DAP. When DAPs are connected, one must be the master and 99 * DAC, or another DAP. When DAPs are connected, one must be the master and
100 * one the slave. Each DAC allows selection of a specific DAP for input, to 100 * one the slave. Each DAC allows selection of a specific DAP for input, to
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 546e29be8a24..d66e5095363a 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -144,7 +144,7 @@ static int tegra_i2s_set_fmt(struct snd_soc_dai *dai,
144 return -EINVAL; 144 return -EINVAL;
145 } 145 }
146 146
147 i2s->reg_ctrl &= ~(TEGRA_I2S_CTRL_BIT_FORMAT_MASK | 147 i2s->reg_ctrl &= ~(TEGRA_I2S_CTRL_BIT_FORMAT_MASK |
148 TEGRA_I2S_CTRL_LRCK_MASK); 148 TEGRA_I2S_CTRL_LRCK_MASK);
149 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { 149 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
150 case SND_SOC_DAIFMT_DSP_A: 150 case SND_SOC_DAIFMT_DSP_A:
@@ -178,7 +178,7 @@ static int tegra_i2s_hw_params(struct snd_pcm_substream *substream,
178 struct snd_pcm_hw_params *params, 178 struct snd_pcm_hw_params *params,
179 struct snd_soc_dai *dai) 179 struct snd_soc_dai *dai)
180{ 180{
181 struct device *dev = substream->pcm->card->dev; 181 struct device *dev = substream->pcm->card->dev;
182 struct tegra_i2s *i2s = snd_soc_dai_get_drvdata(dai); 182 struct tegra_i2s *i2s = snd_soc_dai_get_drvdata(dai);
183 u32 reg; 183 u32 reg;
184 int ret, sample_size, srate, i2sclock, bitcnt; 184 int ret, sample_size, srate, i2sclock, bitcnt;
@@ -296,7 +296,7 @@ static int tegra_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
296 296
297static int tegra_i2s_probe(struct snd_soc_dai *dai) 297static int tegra_i2s_probe(struct snd_soc_dai *dai)
298{ 298{
299 struct tegra_i2s * i2s = snd_soc_dai_get_drvdata(dai); 299 struct tegra_i2s *i2s = snd_soc_dai_get_drvdata(dai);
300 300
301 dai->capture_dma_data = &i2s->capture_dma_data; 301 dai->capture_dma_data = &i2s->capture_dma_data;
302 dai->playback_dma_data = &i2s->playback_dma_data; 302 dai->playback_dma_data = &i2s->playback_dma_data;
@@ -330,7 +330,7 @@ static const struct snd_soc_dai_driver tegra_i2s_dai_template = {
330 330
331static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev) 331static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
332{ 332{
333 struct tegra_i2s * i2s; 333 struct tegra_i2s *i2s;
334 struct resource *mem, *memregion, *dmareq; 334 struct resource *mem, *memregion, *dmareq;
335 u32 of_dma[2]; 335 u32 of_dma[2];
336 u32 dma_ch; 336 u32 dma_ch;