From b60be1711a6145e416b48775f2f13f080c2ce8ff Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@gmail.com>
Date: Thu, 22 Nov 2012 20:49:04 +0100
Subject: [PATCH] --- yaml --- r: 338227 b: refs/heads/master c:
 af89d2897a716e8e46cc5aad052a015d234e490f h: refs/heads/master i:   338225:
 a48392238f4c978236ac06f2ea96f85f4a03937e   338223:
 0efcf401b81abb3a30437d73639a6706b7d04a93 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/staging/line6/midi.c | 56 ------------------------------
 trunk/drivers/staging/line6/midi.h |  5 ---
 3 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/[refs] b/[refs]
index e897b3c82c6f..293cee4261f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e58c868db1dc1402943f6a585529873f445c14f
+refs/heads/master: af89d2897a716e8e46cc5aad052a015d234e490f
diff --git a/trunk/drivers/staging/line6/midi.c b/trunk/drivers/staging/line6/midi.c
index c543c48b1ff1..6d9ecb9d7437 100644
--- a/trunk/drivers/staging/line6/midi.c
+++ b/trunk/drivers/staging/line6/midi.c
@@ -69,10 +69,6 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream)
 		if (done == 0)
 			break;
 
-		if (line6_midibuf_skip_message
-		    (mb, line6midi->midi_mask_transmit))
-			continue;
-
 		send_midi_async(line6, chunk, done);
 	}
 
@@ -281,47 +277,10 @@ static int snd_line6_new_midi(struct snd_line6_midi *line6midi)
 	return 0;
 }
 
-/*
-	"read" request on "midi_mask_transmit" special file.
-*/
-static ssize_t midi_get_midi_mask_transmit(struct device *dev,
-					   struct device_attribute *attr,
-					   char *buf)
-{
-	struct usb_interface *interface = to_usb_interface(dev);
-	struct usb_line6 *line6 = usb_get_intfdata(interface);
-	return sprintf(buf, "%d\n", line6->line6midi->midi_mask_transmit);
-}
-
-/*
-	"write" request on "midi_mask" special file.
-*/
-static ssize_t midi_set_midi_mask_transmit(struct device *dev,
-					   struct device_attribute *attr,
-					   const char *buf, size_t count)
-{
-	struct usb_interface *interface = to_usb_interface(dev);
-	struct usb_line6 *line6 = usb_get_intfdata(interface);
-	unsigned short value;
-	int ret;
-
-	ret = kstrtou16(buf, 10, &value);
-	if (ret)
-		return ret;
-
-	line6->line6midi->midi_mask_transmit = value;
-	return count;
-}
-
-static DEVICE_ATTR(midi_mask_transmit, S_IWUSR | S_IRUGO,
-		   midi_get_midi_mask_transmit, midi_set_midi_mask_transmit);
-
 /* MIDI device destructor */
 static int snd_line6_midi_free(struct snd_device *device)
 {
 	struct snd_line6_midi *line6midi = device->device_data;
-	device_remove_file(line6midi->line6->ifcdev,
-			   &dev_attr_midi_mask_transmit);
 	line6_midibuf_destroy(&line6midi->midibuf_in);
 	line6_midibuf_destroy(&line6midi->midibuf_out);
 	return 0;
@@ -363,17 +322,6 @@ int line6_init_midi(struct usb_line6 *line6)
 	}
 
 	line6midi->line6 = line6;
-
-	switch (line6->product) {
-	case LINE6_DEVID_PODHD300:
-	case LINE6_DEVID_PODHD500:
-		line6midi->midi_mask_transmit = 1;
-		break;
-
-	default:
-		line6midi->midi_mask_transmit = 1;
-	}
-
 	line6->line6midi = line6midi;
 
 	err = snd_device_new(line6->card, SNDRV_DEV_RAWMIDI, line6midi,
@@ -387,10 +335,6 @@ int line6_init_midi(struct usb_line6 *line6)
 	if (err < 0)
 		return err;
 
-	err = device_create_file(line6->ifcdev, &dev_attr_midi_mask_transmit);
-	if (err < 0)
-		return err;
-
 	init_waitqueue_head(&line6midi->send_wait);
 	spin_lock_init(&line6midi->send_urb_lock);
 	spin_lock_init(&line6midi->midi_transmit_lock);
diff --git a/trunk/drivers/staging/line6/midi.h b/trunk/drivers/staging/line6/midi.h
index cf32d777ce62..19dabd54051a 100644
--- a/trunk/drivers/staging/line6/midi.h
+++ b/trunk/drivers/staging/line6/midi.h
@@ -54,11 +54,6 @@ struct snd_line6_midi {
 	*/
 	wait_queue_head_t send_wait;
 
-	/**
-		 Bit mask for output MIDI channels.
-	*/
-	unsigned short midi_mask_transmit;
-
 	/**
 		 Buffer for incoming MIDI stream.
 	*/