diff options
author | Mark Brown <broonie@kernel.org> | 2017-07-03 18:51:38 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-07-03 18:51:38 +0300 |
commit | b821d298f8864dc3c3d42643812df43289159507 (patch) | |
tree | 11a2d7ce5ea4386f4ba17974da6d833fe37502a9 /sound/soc/sh/fsi.c | |
parent | 254d96be464ab57290afb2440c747606030b3d52 (diff) | |
parent | 478b77461a88304ad1566c042d6aa141815ba19f (diff) | |
download | linux-b821d298f8864dc3c3d42643812df43289159507.tar.xz |
Merge remote-tracking branch 'asoc/topic/inte' into asoc-next
Diffstat (limited to 'sound/soc/sh/fsi.c')
-rw-r--r-- | sound/soc/sh/fsi.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index ead520182e26..7c4bdd82bb95 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -301,7 +301,12 @@ struct fsi_master { spinlock_t lock; }; -static int fsi_stream_is_play(struct fsi_priv *fsi, struct fsi_stream *io); +static inline int fsi_stream_is_play(struct fsi_priv *fsi, + struct fsi_stream *io) +{ + return &fsi->playback == io; +} + /* * basic read write function @@ -489,12 +494,6 @@ static void fsi_count_fifo_err(struct fsi_priv *fsi) /* * fsi_stream_xx() function */ -static inline int fsi_stream_is_play(struct fsi_priv *fsi, - struct fsi_stream *io) -{ - return &fsi->playback == io; -} - static inline struct fsi_stream *fsi_stream_get(struct fsi_priv *fsi, struct snd_pcm_substream *substream) { |