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

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

staging: line6: drop store_effects_setup sysfs attr 



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

drivers/staging/line6/pod.c

+0 −68
Original line number Diff line number Diff line
@@ -359,60 +359,6 @@ void line6_pod_transmit_parameter(struct usb_line6_pod *pod, int param, 
		line6_invalidate_current(&pod->dumpreq);

}



/*

	Resolve value to memory location.

*/

static int pod_resolve(const char *buf, short block0, short block1,

		       unsigned char *location)

{

	u8 value;

	short block;

	int ret;



	ret = kstrtou8(buf, 10, &value);

	if (ret)

		return ret;



	block = (value < 0x40) ? block0 : block1;

	value &= 0x3f;

	location[0] = block >> 7;

	location[1] = value | (block & 0x7f);

	return 0;

}



/*

	Send command to retrieve channel/effects setup/amp setup to PODxt Pro.

*/

static ssize_t pod_send_retrieve_command(struct device *dev, const char *buf,

					 size_t count, short block0,

					 short block1)

{

	struct usb_interface *interface = to_usb_interface(dev);

	struct usb_line6_pod *pod = usb_get_intfdata(interface);

	int ret;

	int size = 4;

	char *sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_DUMPMEM, size);



	if (!sysex)

		return 0;



	ret = pod_resolve(buf, block0, block1, sysex + SYSEX_DATA_OFS);

	if (ret) {

		kfree(sysex);

		return ret;

	}

	sysex[SYSEX_DATA_OFS + 2] = 0;

	sysex[SYSEX_DATA_OFS + 3] = 0;

	line6_dump_started(&pod->dumpreq, POD_DUMP_MEMORY);



	if (line6_send_sysex_message(&pod->line6, sysex, size) < size)

		line6_dump_finished(&pod->dumpreq);



	kfree(sysex);

	/* needs some delay here on AMD64 platform */

	return count;

}



/*

	Identify system parameters related to the tuner.

*/
@@ -544,16 +490,6 @@ static ssize_t pod_set_finish(struct device *dev, 
	return count;

}



/*

	"write" request on "store_effects_setup" special file.

*/

static ssize_t pod_set_store_effects_setup(struct device *dev,

					   struct device_attribute *attr,

					   const char *buf, size_t count)

{

	return pod_send_store_command(dev, buf, count, 0x0080, 0x0080);

}



/*

	"read" request on "midi_postprocess" special file.

*/
@@ -731,8 +667,6 @@ static DEVICE_ATTR(routing, S_IWUSR | S_IRUGO, pod_get_routing, 
		   pod_set_routing);

static DEVICE_ATTR(serial_number, S_IRUGO, pod_get_serial_number,

		   line6_nop_write);

static DEVICE_ATTR(store_effects_setup, S_IWUSR, line6_nop_read,

		   pod_set_store_effects_setup);

static DEVICE_ATTR(tuner_freq, S_IWUSR | S_IRUGO, pod_get_tuner_freq,

		   pod_set_tuner_freq);

static DEVICE_ATTR(tuner_mute, S_IWUSR | S_IRUGO, pod_get_tuner_mute,
@@ -823,7 +757,6 @@ static int pod_create_files2(struct device *dev) 
	CHECK_RETURN(device_create_file(dev, &dev_attr_midi_postprocess));

	CHECK_RETURN(device_create_file(dev, &dev_attr_routing));

	CHECK_RETURN(device_create_file(dev, &dev_attr_serial_number));

	CHECK_RETURN(device_create_file(dev, &dev_attr_store_effects_setup));

	CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_freq));

	CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_mute));

	CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_note));
@@ -951,7 +884,6 @@ void line6_pod_disconnect(struct usb_interface *interface) 
			device_remove_file(dev, &dev_attr_midi_postprocess);

			device_remove_file(dev, &dev_attr_routing);

			device_remove_file(dev, &dev_attr_serial_number);

			device_remove_file(dev, &dev_attr_store_effects_setup);

			device_remove_file(dev, &dev_attr_tuner_freq);

			device_remove_file(dev, &dev_attr_tuner_mute);

			device_remove_file(dev, &dev_attr_tuner_note);