1 files changed, 2 insertions, 28 deletions

diff --git a/sound/usb/caiaq/control.c b/sound/usb/caiaq/control.c
index 36ed703a7416..70c3866bb627 100644
--- a/sound/usb/caiaq/control.c
+++ b/sound/usb/caiaq/control.c
@@ -42,21 +42,12 @@ static int control_info(struct snd_kcontrol *kcontrol,
 
         switch (dev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
-                if (pos == 0) {
-                        /* current input mode of A8DJ */
-                        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-                        uinfo->value.integer.min = 0;
-                        uinfo->value.integer.max = 2;
-                        return 0;
-                }
-                break;
-
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
                 if (pos == 0) {
-                        /* current input mode of A4DJ */
+                        /* current input mode of A8DJ and A4DJ */
                         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
                         uinfo->value.integer.min = 0;
-                        uinfo->value.integer.max = 1;
+                        uinfo->value.integer.max = 2;
                         return 0;
                 }
                 break;
@@ -86,14 +77,6 @@ static int control_get(struct snd_kcontrol *kcontrol,
         struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);
         int pos = kcontrol->private_value;
 
-        if (dev->chip.usb_id ==
-                USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ)) {
-                /* A4DJ has only one control */
-                /* do not expose hardware input mode 0 */
-                ucontrol->value.integer.value[0] = dev->control_state[0] - 1;
-                return 0;
-        }
-
         if (pos & CNT_INTVAL)
                 ucontrol->value.integer.value[0]
                         = dev->control_state[pos & ~CNT_INTVAL];
@@ -113,15 +96,6 @@ static int control_put(struct snd_kcontrol *kcontrol,
         unsigned char cmd = EP1_CMD_WRITE_IO;
 
         switch (dev->chip.usb_id) {
-        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ): {
-                /* A4DJ has only one control */
-                /* do not expose hardware input mode 0 */
-                dev->control_state[0] = ucontrol->value.integer.value[0] + 1;
-                snd_usb_caiaq_send_command(dev, EP1_CMD_WRITE_IO,
-                                dev->control_state, sizeof(dev->control_state));
-                return 1;
-        }
-
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
                 cmd = EP1_CMD_DIMM_LEDS;
                 break;