Skip to content

Commit 57f1c3c

Browse files
committed
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
2 parents 5d4156a + c1030cd commit 57f1c3c

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

drivers/hsi/clients/ssi_protocol.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ static void ssip_set_rxstate(struct ssi_protocol *ssi, unsigned int state)
291291
/* CMT speech workaround */
292292
if (atomic_read(&ssi->tx_usecnt))
293293
break;
294-
/* Otherwise fall through */
294+
/* Else, fall through */
295295
case RECEIVING:
296296
mod_timer(&ssi->keep_alive, jiffies +
297297
msecs_to_jiffies(SSIP_KATOUT));
@@ -466,9 +466,10 @@ static void ssip_keep_alive(struct timer_list *t)
466466
case SEND_READY:
467467
if (atomic_read(&ssi->tx_usecnt) == 0)
468468
break;
469+
/* Fall through */
469470
/*
470-
* Fall through. Workaround for cmt-speech
471-
* in that case we relay on audio timers.
471+
* Workaround for cmt-speech in that case
472+
* we relay on audio timers.
472473
*/
473474
case SEND_IDLE:
474475
spin_unlock(&ssi->lock);

drivers/hsi/controllers/omap_ssi_core.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,8 @@ static int ssi_add_controller(struct hsi_controller *ssi,
370370
if (err < 0)
371371
goto out_err;
372372
err = platform_get_irq_byname(pd, "gdd_mpu");
373-
if (err < 0) {
374-
dev_err(&pd->dev, "GDD IRQ resource missing\n");
373+
if (err < 0)
375374
goto out_err;
376-
}
377375
omap_ssi->gdd_irq = err;
378376
tasklet_init(&omap_ssi->gdd_tasklet, ssi_gdd_tasklet,
379377
(unsigned long)ssi);

drivers/hsi/controllers/omap_ssi_port.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,10 +1038,8 @@ static int ssi_port_irq(struct hsi_port *port, struct platform_device *pd)
10381038
int err;
10391039

10401040
err = platform_get_irq(pd, 0);
1041-
if (err < 0) {
1042-
dev_err(&port->device, "Port IRQ resource missing\n");
1041+
if (err < 0)
10431042
return err;
1044-
}
10451043
omap_port->irq = err;
10461044
err = devm_request_threaded_irq(&port->device, omap_port->irq, NULL,
10471045
ssi_pio_thread, IRQF_ONESHOT, "SSI PORT", port);

0 commit comments

Comments
 (0)