summaryrefslogtreecommitdiffstats
path: root/sound/soc/hisilicon/hi6210-i2s.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-10-21 16:59:23 +0100
committerMark Brown <broonie@kernel.org>2018-10-21 16:59:23 +0100
commit65dfb6d6dd2850f3f99f08536d2b14190350c854 (patch)
treee8b0468b3e4d4d54dbea68c9ffce9fd8648be2aa /sound/soc/hisilicon/hi6210-i2s.c
parent576b354ac25b544a31f27c365410d59fcbfee064 (diff)
parent7f91e2af1a4a2c34fc2e8fb046c722e1a9c85399 (diff)
downloadblackbird-obmc-linux-65dfb6d6dd2850f3f99f08536d2b14190350c854.tar.gz
blackbird-obmc-linux-65dfb6d6dd2850f3f99f08536d2b14190350c854.zip
Merge branch 'asoc-4.20' into asoc-next
Diffstat (limited to 'sound/soc/hisilicon/hi6210-i2s.c')
-rw-r--r--sound/soc/hisilicon/hi6210-i2s.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c
index 53344a3b7a60..a69e5b11b3da 100644
--- a/sound/soc/hisilicon/hi6210-i2s.c
+++ b/sound/soc/hisilicon/hi6210-i2s.c
@@ -269,13 +269,13 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream,
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_U16_LE:
signed_data = HII2S_I2S_CFG__S2_CODEC_DATA_FORMAT;
- /* fallthru */
+ /* fall through */
case SNDRV_PCM_FORMAT_S16_LE:
bits = HII2S_BITS_16;
break;
case SNDRV_PCM_FORMAT_U24_LE:
signed_data = HII2S_I2S_CFG__S2_CODEC_DATA_FORMAT;
- /* fallthru */
+ /* fall through */
case SNDRV_PCM_FORMAT_S24_LE:
bits = HII2S_BITS_24;
break;
OpenPOWER on IntegriCloud