Commit af89d289 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Greg Kroah-Hartman
Browse files

staging: line6: drop midi_mask_transmit 



The midi_mask_transmit sysfs attribute selects the MIDI channels on
which to transmit messages.  If ALSA wants to transmit a message that
does not match an allowed channel, the message will be dropped.  This
driver feature is not really used and applications don't know how to
take advantage of it.  Therefore we drop it and rely on applications or
MIDI sequencers to select the channels used for communication.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e58c868

drivers/staging/line6/midi.c

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

drivers/staging/line6/midi.h

+0 −5
Original line number Diff line number Diff line
@@ -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.

	*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE