Commit cab3c900 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Greg Kroah-Hartman

staging: line6: drop clip sysfs attr

Signed-off-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 236666e9
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
/* *INDENT-OFF* */ /* *INDENT-OFF* */
enum { enum {
POD_SYSEX_CLIP = 0x0f,
POD_SYSEX_SAVE = 0x24, POD_SYSEX_SAVE = 0x24,
POD_SYSEX_SYSTEM = 0x56, POD_SYSEX_SYSTEM = 0x56,
POD_SYSEX_SYSTEMREQ = 0x57, POD_SYSEX_SYSTEMREQ = 0x57,
...@@ -311,12 +310,6 @@ void line6_pod_process_message(struct usb_line6_pod *pod) ...@@ -311,12 +310,6 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
pod_save_button_pressed(pod, buf[6], buf[7]); pod_save_button_pressed(pod, buf[6], buf[7]);
break; break;
case POD_SYSEX_CLIP:
dev_dbg(pod->line6.ifcdev, "audio clipped\n");
pod->clipping.value = 1;
wake_up(&pod->clipping.wait);
break;
case POD_SYSEX_STORE: case POD_SYSEX_STORE:
dev_dbg(pod->line6.ifcdev, dev_dbg(pod->line6.ifcdev,
"message %02X not yet implemented\n", "message %02X not yet implemented\n",
...@@ -878,18 +871,6 @@ static ssize_t pod_get_device_id(struct device *dev, ...@@ -878,18 +871,6 @@ static ssize_t pod_get_device_id(struct device *dev,
return sprintf(buf, "%d\n", pod->device_id); return sprintf(buf, "%d\n", pod->device_id);
} }
/*
"read" request on "clip" special file.
*/
static ssize_t pod_wait_for_clip(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);
return wait_event_interruptible(pod->clipping.wait,
pod->clipping.value != 0);
}
/* /*
POD startup procedure. POD startup procedure.
This is a sequence of functions with special requirements (e.g., must This is a sequence of functions with special requirements (e.g., must
...@@ -991,7 +972,6 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1); ...@@ -991,7 +972,6 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1);
#undef GET_SYSTEM_PARAM #undef GET_SYSTEM_PARAM
/* POD special files: */ /* POD special files: */
static DEVICE_ATTR(clip, S_IRUGO, pod_wait_for_clip, line6_nop_write);
static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write); static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write);
static DEVICE_ATTR(dirty, S_IRUGO, pod_get_dirty, line6_nop_write); static DEVICE_ATTR(dirty, S_IRUGO, pod_get_dirty, line6_nop_write);
static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump); static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump);
...@@ -1106,7 +1086,6 @@ static int pod_create_files2(struct device *dev) ...@@ -1106,7 +1086,6 @@ static int pod_create_files2(struct device *dev)
{ {
int err; int err;
CHECK_RETURN(device_create_file(dev, &dev_attr_clip));
CHECK_RETURN(device_create_file(dev, &dev_attr_device_id)); CHECK_RETURN(device_create_file(dev, &dev_attr_device_id));
CHECK_RETURN(device_create_file(dev, &dev_attr_dirty)); CHECK_RETURN(device_create_file(dev, &dev_attr_dirty));
CHECK_RETURN(device_create_file(dev, &dev_attr_dump)); CHECK_RETURN(device_create_file(dev, &dev_attr_dump));
...@@ -1159,7 +1138,6 @@ static int pod_try_init(struct usb_interface *interface, ...@@ -1159,7 +1138,6 @@ static int pod_try_init(struct usb_interface *interface,
init_waitqueue_head(&pod->tuner_freq.wait); init_waitqueue_head(&pod->tuner_freq.wait);
init_waitqueue_head(&pod->tuner_note.wait); init_waitqueue_head(&pod->tuner_note.wait);
init_waitqueue_head(&pod->tuner_pitch.wait); init_waitqueue_head(&pod->tuner_pitch.wait);
init_waitqueue_head(&pod->clipping.wait);
memset(pod->param_dirty, 0xff, sizeof(pod->param_dirty)); memset(pod->param_dirty, 0xff, sizeof(pod->param_dirty));
...@@ -1250,7 +1228,6 @@ void line6_pod_disconnect(struct usb_interface *interface) ...@@ -1250,7 +1228,6 @@ void line6_pod_disconnect(struct usb_interface *interface)
pod->line6. pod->line6.
properties->device_bit, dev); properties->device_bit, dev);
device_remove_file(dev, &dev_attr_clip);
device_remove_file(dev, &dev_attr_device_id); device_remove_file(dev, &dev_attr_device_id);
device_remove_file(dev, &dev_attr_dirty); device_remove_file(dev, &dev_attr_dirty);
device_remove_file(dev, &dev_attr_dump); device_remove_file(dev, &dev_attr_dump);
......
...@@ -132,11 +132,6 @@ struct usb_line6_pod { ...@@ -132,11 +132,6 @@ struct usb_line6_pod {
*/ */
struct ValueWait routing; struct ValueWait routing;
/**
Wait for audio clipping event.
*/
struct ValueWait clipping;
/** /**
Timer for device initializaton. Timer for device initializaton.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment