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

Commit c1099fcb authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag 



Since the last patch made the ENTER_UART command optional, the
enter_uart option and its corresponding flag have become superfluous.
The uart_enter option remains for backward compatibility but just prints
a warning when used.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 69d8d3eb

Documentation/sound/alsa/ALSA-Configuration.txt

+0 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    port	- port number or -1 (disable)

    irq		- IRQ number or -1 (disable)

    pnp		- PnP detection - 0 = disable, 1 = enable (default)

    uart_enter	- Issue UART_ENTER command at open - bool, default = on



    This module supports multiple devices and PnP.

include/sound/mpu401.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#define MPU401_INFO_INTEGRATED	(1 << 2)	/* integrated h/w port */

#define MPU401_INFO_MMIO	(1 << 3)	/* MMIO access */

#define MPU401_INFO_TX_IRQ	(1 << 4)	/* independent TX irq */

#define MPU401_INFO_UART_ONLY	(1 << 5)	/* No ENTER_UART cmd needed */



#define MPU401_MODE_BIT_INPUT		0

#define MPU401_MODE_BIT_OUTPUT		1

sound/drivers/mpu401/mpu401.c

+4 −2
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard) 
	struct snd_card *card;

	int err;



	if (!uart_enter[dev])

		snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");



	*rcard = NULL;

	card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);

	if (card == NULL)
@@ -83,8 +86,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard) 
		strcat(card->longname, "polled");

	}



	err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev],

				  uart_enter[dev] ? 0 : MPU401_INFO_UART_ONLY,

	err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev], 0,

				  irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0,

				  NULL);

	if (err < 0) {

sound/drivers/mpu401/mpu401_uart.c

+1 −2
Original line number Diff line number Diff line
@@ -270,8 +270,7 @@ static int snd_mpu401_do_reset(struct snd_mpu401 *mpu) 
{

	if (snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1))

		return -EIO;

	if (!(mpu->info_flags & MPU401_INFO_UART_ONLY) &&

	    snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 0))

	if (snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 0))

		return -EIO;

	return 0;

}