Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 216627
b: refs/heads/master
c: 0054578
h: refs/heads/master
i:
  216625: 9ceff36
  216623: 26fd04e
v: v3
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Oct 12, 2010
1 parent 1fc72e0 commit 12b8123
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf6edd007b6c371613a2f48e58f3a4238d9775c8
refs/heads/master: 00545785d7e355b0b1b9fb820ec70cb2ae51b409
13 changes: 9 additions & 4 deletions trunk/sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,11 @@ static u32 fsi_get_info_flags(struct fsi_priv *fsi)
master->info->portb_flags;
}

static inline int fsi_is_play(struct snd_pcm_substream *substream)
{
return substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
}

static int fsi_is_master_mode(struct fsi_priv *fsi, int is_play)
{
u32 mode;
Expand Down Expand Up @@ -726,7 +731,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
u32 fmt;
u32 reg;
u32 data;
int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
int is_play = fsi_is_play(substream);
int is_master;

pm_runtime_get_sync(dai->dev);
Expand Down Expand Up @@ -813,7 +818,7 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct fsi_priv *fsi = fsi_get_priv(substream);
int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
int is_play = fsi_is_play(substream);

fsi_irq_disable(fsi, is_play);
fsi_clk_ctrl(fsi, 0);
Expand All @@ -826,7 +831,7 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
{
struct fsi_priv *fsi = fsi_get_priv(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
int is_play = fsi_is_play(substream);
int ret = 0;

switch (cmd) {
Expand All @@ -853,7 +858,7 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
struct fsi_master *master = fsi_get_master(fsi);
int (*set_rate)(int is_porta, int rate) = master->info->set_rate;
int fsi_ver = master->core->ver;
int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
int is_play = fsi_is_play(substream);
int ret;

/* if slave mode, set_rate is not needed */
Expand Down

0 comments on commit 12b8123

Please sign in to comment.