diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-22 12:02:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-22 12:02:21 -0700 |
| commit | 57f1c3caf5137d4493fcd1d07c3ae4a5636f4949 (patch) | |
| tree | 1a4f6003f3f1e8730abc476020bbf33452813f24 /drivers/hsi/clients | |
| parent | 5d4156ac48a4f4c0b7f980a51937e33362f78911 (diff) | |
| parent | c1030cd456198a2c58f718c3c4b215698d635553 (diff) | |
Merge tag 'hsi-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
"Misc cleanups"
* tag 'hsi-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: Remove dev_err() usage after platform_get_irq()
HSI: ssi_protocol: Mark expected switch fall-throughs
Diffstat (limited to 'drivers/hsi/clients')
| -rw-r--r-- | drivers/hsi/clients/ssi_protocol.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c index 0253e76f1df2..365b5d5967ac 100644 --- a/drivers/hsi/clients/ssi_protocol.c +++ b/drivers/hsi/clients/ssi_protocol.c @@ -291,7 +291,7 @@ static void ssip_set_rxstate(struct ssi_protocol *ssi, unsigned int state) /* CMT speech workaround */ if (atomic_read(&ssi->tx_usecnt)) break; - /* Otherwise fall through */ + /* Else, fall through */ case RECEIVING: mod_timer(&ssi->keep_alive, jiffies + msecs_to_jiffies(SSIP_KATOUT)); @@ -466,9 +466,10 @@ static void ssip_keep_alive(struct timer_list *t) case SEND_READY: if (atomic_read(&ssi->tx_usecnt) == 0) break; + /* Fall through */ /* - * Fall through. Workaround for cmt-speech - * in that case we relay on audio timers. + * Workaround for cmt-speech in that case + * we relay on audio timers. */ case SEND_IDLE: spin_unlock(&ssi->lock); |