leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HSI changes for the 5.4 series

Browse Source 
* misc. cleanups
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAl18DxQACgkQ2O7X88g7
 +pqvdBAAokuGHRRZynEzGfkss1cvNRfGYHp8U2VCGBnZtLvT1ew/Zv2K51lueOMF
 TbfkMTqKXiLD8zS6gC04zSRYuFZ0u2aMsLNwuPkTNMQfpdps+UDAj0BWrqSAMgo5
 kKWh/G3yudDZQHLa9oLEBRUaDQFiJ0kZIozHNSSh2TplXeDJt1w0orzkjIv7BdPp
 9ch8ZeZ7oj1e920Gqo7FnDvcIhEWCLIqp8ZHOslO0hY/Hw0WEm4kfGRFDETBZubj
 myLOJtRa31iIKJt7j8WLAXeHSfRUS6JsYfkmn5WDIEI1arvbapBGQjqFVfzEidHj
 2JAqskft3zPqRP2Gj928RTJqHtQVvcN+fvvuIDW4FSI8N0F3TJkRZeikY4En/3nA
 k3mYlUHNu2AISnCTRylIP1K6daH4myunzyfVb7O4zqFiSYuDzsK+eWjaJBV3OpFW
 JJEGlPtEz1wen+5UOR5dD5bV1VtOeGR1sFFyVrMpqrAd+uBmVpJxoOyML2CbG+3v
 5ZfrDz7N+Uu0a4exxBH4bvAtTGJbyPiOz9VrlBWZw9YC9nahlP/QTEfv21A4M/Py
 c56SEYxHwGuCRS8jMa7OoDNO+HaOEWMz2Ilt8etIgmXtwoergaQc8HTfHbW50hqg
 oK0H8GKERXKEwGIgpgmtAbUlNKL37xSvZorSMFrKRVnUOoOACP0=
 =p8le
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2019-09-22 12:02:21 -07:00
commit 57f1c3caf5
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/hsi/clients/ssi_protocol.c
View File

@ -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);

4
drivers/hsi/controllers/omap_ssi_core.c
View File

@ -370,10 +370,8 @@ static int ssi_add_controller(struct hsi_controller *ssi,
if (err < 0)
goto out_err;
err = platform_get_irq_byname(pd, "gdd_mpu");
if (err < 0) {
dev_err(&pd->dev, "GDD IRQ resource missing\n");
if (err < 0)
goto out_err;
}
omap_ssi->gdd_irq = err;
tasklet_init(&omap_ssi->gdd_tasklet, ssi_gdd_tasklet,
(unsigned long)ssi);

4
drivers/hsi/controllers/omap_ssi_port.c
View File

@ -1038,10 +1038,8 @@ static int ssi_port_irq(struct hsi_port *port, struct platform_device *pd)
int err;
err = platform_get_irq(pd, 0);
if (err < 0) {
dev_err(&port->device, "Port IRQ resource missing\n");
if (err < 0)
return err;
}
omap_port->irq = err;
err = devm_request_threaded_irq(&port->device, omap_port->irq, NULL,
ssi_pio_thread, IRQF_ONESHOT, "SSI PORT", port);