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

diff --combined drivers/hsi/clients/ssi_protocol.c
index 0253e76,504d00e..365b5d5
--- 1/drivers/hsi/clients/ssi_protocol.c
--- 2/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@@ -181,8 -181,7 +181,8 @@@ static void ssip_skb_to_msg(struct sk_b
                sg = sg_next(sg);
                BUG_ON(!sg);
                frag = &skb_shinfo(skb)->frags[i];
 -              sg_set_page(sg, frag->page.p, frag->size, frag->page_offset);
 +              sg_set_page(sg, skb_frag_page(frag), skb_frag_size(frag),
 +                              skb_frag_off(frag));
        }
  }
  
@@@ -291,7 -290,7 +291,7 @@@ static void ssip_set_rxstate(struct ssi
                /* 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 -465,10 +466,10 @@@ static void ssip_keep_alive(struct time
                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);