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

Merge tag 'hsi-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Browse Source 
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
parent 5d4156ac48 c1030cd456
commit 57f1c3caf5
3 changed files with 6 additions and 9 deletions
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 */ /* CMT speech workaround */
if (atomic_read(&ssi->tx_usecnt)) if (atomic_read(&ssi->tx_usecnt))
break; break;
/* Otherwise fall through */ /* Else, fall through */
case RECEIVING: case RECEIVING:
mod_timer(&ssi->keep_alive, jiffies + mod_timer(&ssi->keep_alive, jiffies +
msecs_to_jiffies(SSIP_KATOUT)); msecs_to_jiffies(SSIP_KATOUT));
@ -466,9 +466,10 @@ static void ssip_keep_alive(struct timer_list *t)
case SEND_READY: case SEND_READY:
if (atomic_read(&ssi->tx_usecnt) == 0) if (atomic_read(&ssi->tx_usecnt) == 0)
break; break;
/* Fall through */
/* /*
* Fall through. Workaround for cmt-speech * Workaround for cmt-speech in that case
* in that case we relay on audio timers. * we relay on audio timers.
*/ */
case SEND_IDLE: case SEND_IDLE:
spin_unlock(&ssi->lock); 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) if (err < 0)
goto out_err; goto out_err;
err = platform_get_irq_byname(pd, "gdd_mpu"); err = platform_get_irq_byname(pd, "gdd_mpu");
if (err < 0) { if (err < 0)
dev_err(&pd->dev, "GDD IRQ resource missing\n");
goto out_err; goto out_err;
}
omap_ssi->gdd_irq = err; omap_ssi->gdd_irq = err;
tasklet_init(&omap_ssi->gdd_tasklet, ssi_gdd_tasklet, tasklet_init(&omap_ssi->gdd_tasklet, ssi_gdd_tasklet,
(unsigned long)ssi); (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; int err;
err = platform_get_irq(pd, 0); err = platform_get_irq(pd, 0);
if (err < 0) { if (err < 0)
dev_err(&port->device, "Port IRQ resource missing\n");
return err; return err;
}
omap_port->irq = err; omap_port->irq = err;
err = devm_request_threaded_irq(&port->device, omap_port->irq, NULL, err = devm_request_threaded_irq(&port->device, omap_port->irq, NULL,
ssi_pio_thread, IRQF_ONESHOT, "SSI PORT", port); ssi_pio_thread, IRQF_ONESHOT, "SSI PORT", port);