Skip to content

Commit

Permalink
ASoC: tegra: fix some checkpatch warnings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Warren authored and Mark Brown committed Apr 1, 2012
1 parent 4df8271 commit 7deb2b4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion sound/soc/tegra/tegra_das.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ struct tegra_das {
* DAS: Digital audio switch (HW module controlled by this driver)
* DAP: Digital audio port (port/pins on Tegra device)
* DAC: Digital audio controller (e.g. I2S or AC97 controller elsewhere)
*
*
* The Tegra DAS is a mux/cross-bar which can connect each DAP to a specific
* DAC, or another DAP. When DAPs are connected, one must be the master and
* one the slave. Each DAC allows selection of a specific DAP for input, to
Expand Down
8 changes: 4 additions & 4 deletions sound/soc/tegra/tegra_i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static int tegra_i2s_set_fmt(struct snd_soc_dai *dai,
return -EINVAL;
}

i2s->reg_ctrl &= ~(TEGRA_I2S_CTRL_BIT_FORMAT_MASK |
i2s->reg_ctrl &= ~(TEGRA_I2S_CTRL_BIT_FORMAT_MASK |
TEGRA_I2S_CTRL_LRCK_MASK);
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_DSP_A:
Expand Down Expand Up @@ -178,7 +178,7 @@ static int tegra_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
{
struct device *dev = substream->pcm->card->dev;
struct device *dev = substream->pcm->card->dev;
struct tegra_i2s *i2s = snd_soc_dai_get_drvdata(dai);
u32 reg;
int ret, sample_size, srate, i2sclock, bitcnt;
Expand Down Expand Up @@ -296,7 +296,7 @@ static int tegra_i2s_trigger(struct snd_pcm_substream *substream, int cmd,

static int tegra_i2s_probe(struct snd_soc_dai *dai)
{
struct tegra_i2s * i2s = snd_soc_dai_get_drvdata(dai);
struct tegra_i2s *i2s = snd_soc_dai_get_drvdata(dai);

dai->capture_dma_data = &i2s->capture_dma_data;
dai->playback_dma_data = &i2s->playback_dma_data;
Expand Down Expand Up @@ -330,7 +330,7 @@ static const struct snd_soc_dai_driver tegra_i2s_dai_template = {

static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
{
struct tegra_i2s * i2s;
struct tegra_i2s *i2s;
struct resource *mem, *memregion, *dmareq;
u32 of_dma[2];
u32 dma_ch;
Expand Down

0 comments on commit 7deb2b4

Please sign in to comment.