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

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

staging: line6: drop dump sysfs attr 



Once further sysfs attrs have been removed it will also be possible to
drop prog_data and other pieces which we keep for now.

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

drivers/staging/line6/pod.c

+3 −57
Original line number Diff line number Diff line
@@ -137,24 +137,6 @@ static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code, 
					size);

}



/*

	Send channel dump data to the PODxt Pro.

*/

static void pod_dump(struct usb_line6_pod *pod, const unsigned char *data)

{

	int size = 1 + sizeof(pod->prog_data);

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

	if (!sysex)

		return;

	/* Don't know what this is good for, but PODxt Pro transmits it, so we

	 * also do... */

	sysex[SYSEX_DATA_OFS] = 5;

	memcpy(sysex + SYSEX_DATA_OFS + 1, data, sizeof(pod->prog_data));

	line6_send_sysex_message(&pod->line6, sysex, size);

	memcpy(&pod->prog_data, data, sizeof(pod->prog_data));

	kfree(sysex);

}



/*

	Store parameter value in driver memory.

*/
@@ -411,7 +393,9 @@ static ssize_t pod_send_store_command(struct device *dev, const char *buf, 
	if (!sysex)

		return 0;



	sysex[SYSEX_DATA_OFS] = 5;	/* see pod_dump() */

	/* Don't know what this is good for, but PODxt Pro transmits it, so we

	 * also do... */

	sysex[SYSEX_DATA_OFS] = 5;

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

	if (ret) {

		kfree(sysex);
@@ -512,41 +496,6 @@ static ssize_t pod_get_name_buf(struct device *dev, 
				buf);

}



/*

	"read" request on "dump" special file.

*/

static ssize_t pod_get_dump(struct device *dev, struct device_attribute *attr,

			    char *buf)

{

	struct usb_interface *interface = to_usb_interface(dev);

	struct usb_line6_pod *pod = usb_get_intfdata(interface);

	int retval = line6_dump_wait_interruptible(&pod->dumpreq);

	if (retval < 0)

		return retval;

	memcpy(buf, &pod->prog_data, sizeof(pod->prog_data));

	return sizeof(pod->prog_data);

}



/*

	"write" request on "dump" special file.

*/

static ssize_t pod_set_dump(struct device *dev, struct device_attribute *attr,

			    const char *buf, size_t count)

{

	struct usb_interface *interface = to_usb_interface(dev);

	struct usb_line6_pod *pod = usb_get_intfdata(interface);



	if (count != sizeof(pod->prog_data)) {

		dev_err(pod->line6.ifcdev,

			"data block must be exactly %d bytes\n",

			(int)sizeof(pod->prog_data));

		return -EINVAL;

	}



	pod_dump(pod, buf);

	return sizeof(pod->prog_data);

}



/*

	Identify system parameters related to the tuner.

*/
@@ -943,7 +892,6 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1); 


/* POD special files: */

static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write);

static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump);

static DEVICE_ATTR(dump_buf, S_IWUSR | S_IRUGO, pod_get_dump_buf,

		   pod_set_dump_buf);

static DEVICE_ATTR(finish, S_IWUSR, line6_nop_read, pod_set_finish);
@@ -1056,7 +1004,6 @@ static int pod_create_files2(struct device *dev) 
	int err;



	CHECK_RETURN(device_create_file(dev, &dev_attr_device_id));

	CHECK_RETURN(device_create_file(dev, &dev_attr_dump));

	CHECK_RETURN(device_create_file(dev, &dev_attr_dump_buf));

	CHECK_RETURN(device_create_file(dev, &dev_attr_finish));

	CHECK_RETURN(device_create_file(dev, &dev_attr_firmware_version));
@@ -1195,7 +1142,6 @@ void line6_pod_disconnect(struct usb_interface *interface) 
					       properties->device_bit, dev);



			device_remove_file(dev, &dev_attr_device_id);

			device_remove_file(dev, &dev_attr_dump);

			device_remove_file(dev, &dev_attr_dump_buf);

			device_remove_file(dev, &dev_attr_finish);

			device_remove_file(dev, &dev_attr_firmware_version);