Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338224
b: refs/heads/master
c: c7b8ca5
h: refs/heads/master
v: v3
  • Loading branch information
Stefan Hajnoczi authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 0efcf40 commit bb3d682
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 99c54e9830feb746c9175fae887546e741bb56eb
refs/heads/master: c7b8ca5a596197f6b1069bf4164387f474873f00
21 changes: 0 additions & 21 deletions trunk/drivers/staging/line6/pod.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,24 +370,6 @@ static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,
return 0;
}

/*
"write" request on "finish" special file.
*/
static ssize_t pod_set_finish(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);
int size = 0;
char *sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_FINISH, size);
if (!sysex)
return 0;
line6_send_sysex_message(&pod->line6, sysex, size);
kfree(sysex);
return count;
}

/*
"read" request on "midi_postprocess" special file.
*/
Expand Down Expand Up @@ -526,7 +508,6 @@ static void pod_startup5(struct work_struct *work)

/* POD special files: */
static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write);
static DEVICE_ATTR(finish, S_IWUSR, line6_nop_read, pod_set_finish);
static DEVICE_ATTR(firmware_version, S_IRUGO, pod_get_firmware_version,
line6_nop_write);
static DEVICE_ATTR(midi_postprocess, S_IWUSR | S_IRUGO,
Expand Down Expand Up @@ -612,7 +593,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_finish));
CHECK_RETURN(device_create_file(dev, &dev_attr_firmware_version));
CHECK_RETURN(device_create_file(dev, &dev_attr_midi_postprocess));
CHECK_RETURN(device_create_file(dev, &dev_attr_serial_number));
Expand Down Expand Up @@ -727,7 +707,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_finish);
device_remove_file(dev, &dev_attr_firmware_version);
device_remove_file(dev, &dev_attr_midi_postprocess);
device_remove_file(dev, &dev_attr_serial_number);
Expand Down

0 comments on commit bb3d682

Please sign in to comment.