[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: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

4 files changed, 5 insertions, 6 deletions

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index a035eb64042f..4b48c2e82c3c 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -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.
     
diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h
index d5c1396c4c9e..8c88267e9bea 100644
--- a/include/sound/mpu401.h
+++ b/include/sound/mpu401.h
@@ -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
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 67c6e9745418..23fee622c8fc 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -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) {
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index b5c5dd1e61bd..43c6f207c3c2 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -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;
 }