Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57f1c3ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5d4156ac c1030cd4

drivers/hsi/clients/ssi_protocol.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

drivers/hsi/controllers/omap_ssi_core.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/hsi/controllers/omap_ssi_port.c

+1 −3
Original line number Diff line number Diff line
@@ -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);